From 09f274515f9876569ea165e09257eaeee5959d5b Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 10 Feb 2002 21:13:52 +0000 Subject: [PATCH] - make peace with automake et al in 8.0, ugh. CVS patchset: 5314 CVS date: 2002/02/10 21:13:52 --- ABOUT-NLS | 308 +- CHANGES | 1 + acconfig.h | 19 +- aclocal.m4 | 1166 ++++- autogen.sh | 14 +- beecrypt/COPYING | 666 +-- beecrypt/INSTALL | 11 +- beecrypt/Makefile.in | 529 +- beecrypt/aclocal.m4 | 1069 +++- beecrypt/autogen.sh | 14 +- beecrypt/config.gnu.h.in | 263 +- beecrypt/config.guess | 240 +- beecrypt/config.sub | 149 +- beecrypt/configure | 11287 ++++++++++++++++++++++++++++++------------ beecrypt/configure.in | 6 +- beecrypt/depcomp | 411 ++ beecrypt/docs/Makefile.in | 162 +- beecrypt/gas/Makefile.in | 162 +- beecrypt/install-sh | 25 +- beecrypt/ltmain.sh | 253 +- beecrypt/masm/Makefile.in | 162 +- beecrypt/mkinstalldirs | 2 +- beecrypt/mwerks/Makefile.in | 162 +- beecrypt/tests/Makefile.in | 300 +- configure.in | 16 +- db3/.cvsignore | 5 +- depcomp | 411 ++ install-sh | 21 +- intl/ChangeLog | 4 +- intl/Makefile.in | 23 +- intl/VERSION | 2 +- intl/bindtextdom.c | 17 +- intl/config.charset | 14 +- intl/dcgettext.c | 17 +- intl/dcigettext.c | 18 +- intl/dcngettext.c | 17 +- intl/dgettext.c | 17 +- intl/dngettext.c | 17 +- intl/explodename.c | 17 +- intl/finddomain.c | 17 +- intl/gettext.c | 17 +- intl/gettext.h | 17 +- intl/gettextP.h | 17 +- intl/hash-string.h | 17 +- intl/intl-compat.c | 27 +- intl/l10nflist.c | 17 +- intl/libgettext.h | 17 +- intl/libgnuintl.h | 17 +- intl/loadinfo.h | 17 +- intl/loadmsgcat.c | 17 +- intl/localcharset.c | 4 +- intl/locale.alias | 19 +- intl/localealias.c | 17 +- intl/ngettext.c | 17 +- intl/plural.c | 51 +- intl/plural.y | 17 +- intl/textdomain.c | 17 +- macros.in | 4 +- missing | 133 +- mkinstalldirs | 4 +- po/ChangeLog | 6 + po/Makefile.in.in | 196 +- po/cs.po | 504 +- po/da.po | 504 +- po/de.po | 505 +- po/en_RN.po | 500 +- po/es.po | 500 +- po/eu_ES.po | 500 +- po/fi.po | 504 +- po/fr.po | 507 +- po/gl.po | 500 +- po/hu.po | 500 +- po/id.po | 500 +- po/is.po | 504 +- po/it.po | 500 +- po/ja.po | 504 +- po/ko.po | 504 +- po/no.po | 504 +- po/pl.po | 504 +- po/pt.po | 504 +- po/pt_BR.po | 505 +- po/ro.po | 500 +- po/ru.po | 504 +- po/sk.po | 504 +- po/sl.po | 506 +- po/sr.po | 504 +- po/sv.po | 504 +- po/tr.po | 504 +- po/uk.po | 500 +- po/wa.po | 500 +- po/zh.po | 500 +- po/zh_CN.GB2312.po | 500 +- popt/ABOUT-NLS | 324 ++ popt/acconfig.h | 19 +- popt/configure.in | 5 +- popt/depcomp | 411 ++ popt/install-sh | 21 +- popt/intl/ChangeLog | 4 +- popt/intl/Makefile.in | 23 +- popt/intl/VERSION | 2 +- popt/intl/bindtextdom.c | 17 +- popt/intl/config.charset | 14 +- popt/intl/dcgettext.c | 17 +- popt/intl/dcigettext.c | 18 +- popt/intl/dcngettext.c | 17 +- popt/intl/dgettext.c | 17 +- popt/intl/dngettext.c | 17 +- popt/intl/explodename.c | 17 +- popt/intl/finddomain.c | 17 +- popt/intl/gettext.c | 17 +- popt/intl/gettext.h | 17 +- popt/intl/gettextP.h | 17 +- popt/intl/hash-string.h | 17 +- popt/intl/intl-compat.c | 27 +- popt/intl/l10nflist.c | 17 +- popt/intl/libgettext.h | 17 +- popt/intl/libgnuintl.h | 17 +- popt/intl/libintl.h | 182 - popt/intl/loadinfo.h | 17 +- popt/intl/loadmsgcat.c | 17 +- popt/intl/localcharset.c | 4 +- popt/intl/locale.alias | 19 +- popt/intl/localealias.c | 17 +- popt/intl/ngettext.c | 17 +- popt/intl/plural.c | 51 +- popt/intl/plural.y | 17 +- popt/intl/textdomain.c | 17 +- popt/missing | 133 +- popt/mkinstalldirs | 4 +- popt/po/ChangeLog | 6 + popt/po/Makefile.in.in | 196 +- python/Makefile.am | 4 +- python/Makefile.in | 430 +- rpm.spec | 1 + rpm.spec.in | 1 + rpmdb/Makefile.am | 2 +- rpmio/Makefile.am | 8 +- zlib/Makefile.in | 520 +- zlib/aclocal.m4 | 991 +++- zlib/configure.in | 1 - zlib/depcomp | 411 ++ zlib/ltmain.sh | 5009 +++++++++++++++++++ 142 files changed, 28793 insertions(+), 14146 deletions(-) create mode 100755 beecrypt/depcomp create mode 100755 depcomp create mode 100644 po/ChangeLog create mode 100644 popt/ABOUT-NLS create mode 100755 popt/depcomp delete mode 100644 popt/intl/libintl.h create mode 100644 popt/po/ChangeLog create mode 100755 zlib/depcomp create mode 100644 zlib/ltmain.sh diff --git a/ABOUT-NLS b/ABOUT-NLS index 28d38c7..5fde45a 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -8,7 +8,7 @@ A few packages already provide translations for their messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do *not* +itself available at your nearest GNU archive site. But you do _not_ need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. @@ -22,8 +22,8 @@ related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -One advise in advance -===================== +Quick configuration advice +========================== If you want to exploit the full power of internationalization, you should configure it using @@ -34,13 +34,14 @@ to force usage of internationalizing routines provided within this package, despite the existence of internationalizing capabilities in the operating system where this package is being installed. So far, only the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias or message inheritance) as the -implementation here. It is also not possible to offer this additional -functionality on top of a `catgets' implementation. Future versions of -GNU `gettext' will very likely convey even more functionality. So it -might be a good idea to change to GNU `gettext' as soon as possible. - - So you need not provide this option if you are using GNU libc 2 or +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or you have installed a recent copy of the GNU gettext package with the included `libintl'. @@ -53,23 +54,20 @@ Most such packages use GNU `gettext'. Other packages have their own ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system provides -usable `catgets' (if using this is selected by the installer) or -`gettext' functions. If neither is available, the GNU `gettext' own +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the GNU `gettext' own library will be used. This library is wholly contained within this package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is *not* required. Installers may use +the GNU `gettext' package is _not_ required. Installers may use special options at configuration time for changing the default behaviour. The commands: ./configure --with-included-gettext - ./configure --with-catgets ./configure --disable-nls -will respectively bypass any pre-existing `catgets' or `gettext' to use -the internationalizing routines provided within this package, enable -the use of the `catgets' functions (if found on the locale system), or -else, *totally* disable translation of messages. +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will @@ -83,18 +81,10 @@ package is more recent, you should use to prevent auto-detection. - By default the configuration process will not test for the `catgets' -function and therefore they will not be used. The reasons are already -given above: the emulation on top of `catgets' cannot provide all the -extensions provided by the GNU `gettext' library. If you nevertheless -want to use the `catgets' functions use - - ./configure --with-catgets - -to enable the test for `catgets' (this causes no harm if `catgets' is -not available on your system). If you really select this option we -would like to hear about the reasons because we cannot think of any -good one ourself. + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -110,22 +100,35 @@ Using This Package As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -ISO 639 `LL' two-letter code prior to using the programs in the -package. For example, let's suppose that you speak German. At the -shell prompt, merely execute `setenv LANG de' (in `csh'), -`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This -can be done from your `.login' or `.profile' file, once and for all. - - An operating system might already offer message localization for -many of its programs, while other programs have been installed locally -with the full capabilities of GNU `gettext'. Just using `gettext' -extended syntax for `LANG' would break proper localization of already -available operating system programs. In this case, users should set -both `LANGUAGE' and `LANG' variables in their environment, as programs -using GNU `gettext' give preference to `LANGUAGE'. For example, some -Swedish users would rather read translations in German than English for -when Swedish is not available. This is easily accomplished by setting -`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. Translating Teams ================= @@ -133,33 +136,21 @@ Translating Teams For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. -Each translation team has its own mailing list, courtesy of Linux -International. You may reach your translation team at the address -`LL@li.org', replacing LL by the two-letter ISO 639 code for your -language. Language codes are *not* the same as the country codes given -in ISO 3166. The following translation teams exist, as of December -1997: - - Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', - Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian - `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', - Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish - `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', - Swedish `sv', and Turkish `tr'. - -For example, you may reach the Chinese translation team by writing to -`zh@li.org'. - - If you'd like to volunteer to *work* at translating messages, you +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/', in the "National teams" +area. + + If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. -The subscribing address is *not* the same as the list itself, it has +The subscribing address is _not_ the same as the list itself, it has `-request' appended. For example, speakers of Swedish can send a message to `sv-request@li.org', having this message body: subscribe Keep in mind that team members are expected to participate -*actively* in translations, or at solving translational difficulties, +_actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to get started, please write to `translation@iro.umontreal.ca' to reach the @@ -173,42 +164,128 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of December -1997. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination. - - Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv - .----------------------------------------------------. - bash | [] [] [] | 3 - bison | [] [] [] | 3 - clisp | [] [] [] [] | 4 - cpio | [] [] [] [] [] [] | 6 - diffutils | [] [] [] [] [] | 5 - enscript | [] [] [] [] [] [] | 6 - fileutils | [] [] [] [] [] [] [] [] [] [] | 10 - findutils | [] [] [] [] [] [] [] [] [] | 9 - flex | [] [] [] [] | 4 - gcal | [] [] [] [] [] | 5 - gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 - grep | [] [] [] [] [] [] [] [] [] [] | 10 - hello | [] [] [] [] [] [] [] [] [] [] [] | 11 - id-utils | [] [] [] | 3 - indent | [] [] [] [] [] | 5 - libc | [] [] [] [] [] [] [] | 7 - m4 | [] [] [] [] [] [] | 6 - make | [] [] [] [] [] [] | 6 - music | [] [] | 2 - ptx | [] [] [] [] [] [] [] [] | 8 - recode | [] [] [] [] [] [] [] [] [] | 9 - sh-utils | [] [] [] [] [] [] [] [] | 8 - sharutils | [] [] [] [] [] [] | 6 - tar | [] [] [] [] [] [] [] [] [] [] [] | 11 - texinfo | [] [] [] | 3 - textutils | [] [] [] [] [] [] [] [] [] | 9 - wdiff | [] [] [] [] [] [] [] [] | 8 - `----------------------------------------------------' - 17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv - 27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 +matrix shows the current state of internationalization, as of September +2001. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja + +----------------------------------------------------+ + a2ps | [] [] [] | + bash | [] [] [] [] | + bfd | | + binutils | [] | + bison | [] [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] [] | + fetchmail | | + fileutils | [] [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + freetype | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext | [] [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] [] [] | + gprof | | + grep | [] [] [] [] [] [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] | + jpilot | [] | + kbd | | + ld | [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] [] [] [] | + make | [] [] [] [] [] [] | + mysecretdiary | [] | + nano | [] [] [] | + opcodes | | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + sketch | | + soundtracker | [] [] [] | + sp | | + tar | [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] [] [] | + textutils | [] [] [] [] [] [] [] [] | + util-linux | [] [] | + wdiff | [] [] [] | + wget | [] [] [] [] [] [] [] [] [] [] | + +----------------------------------------------------+ + bg cs da de el en eo es et fi fr gl he hr id it ja + 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + + ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + +----------------------------------------------------+ + a2ps | [] [] [] | 6 + bash | | 4 + bfd | | 0 + binutils | | 1 + bison | [] | 6 + clisp | [] | 5 + cpio | [] [] [] [] [] | 10 + diffutils | [] [] [] [] | 11 + enscript | [] [] [] | 5 + error | [] [] | 4 + fetchmail | | 0 + fileutils | [] [] [] [] [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] [] [] | 16 + flex | [] [] [] | 6 + freetype | | 0 + gas | | 0 + gawk | [] | 3 + gcal | | 0 + gcc | | 0 + gettext | [] [] [] [] [] [] [] [] | 18 + gnupg | [] [] [] | 10 + gprof | | 0 + grep | [] [] [] [] | 12 + hello | [] [] [] [] [] [] [] [] [] [] [] | 22 + id-utils | [] [] [] | 6 + indent | [] [] [] [] [] [] [] | 12 + jpilot | | 1 + kbd | [] | 1 + ld | | 1 + libc | [] [] [] [] [] [] [] [] | 16 + lilypond | [] [] | 3 + lynx | [] [] [] [] | 8 + m4 | [] [] [] [] | 12 + make | [] [] [] [] [] [] | 12 + mysecretdiary | | 1 + nano | [] | 4 + opcodes | [] | 1 + parted | [] [] | 5 + ptx | [] [] [] [] [] [] [] [] | 15 + python | | 0 + recode | [] [] [] [] | 13 + sed | [] [] [] [] [] [] [] | 19 + sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 + sharutils | [] [] [] | 11 + sketch | | 0 + soundtracker | | 3 + sp | | 0 + tar | [] [] [] [] [] [] [] | 15 + texinfo | [] | 7 + textutils | [] [] [] [] [] [] [] [] | 16 + util-linux | [] [] | 4 + wdiff | [] [] [] [] | 7 + wget | [] [] [] [] [] [] [] | 17 + +----------------------------------------------------+ + 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -221,6 +298,27 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If December 1997 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. + If September 2001 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + +Using `gettext' in new packages +=============================== + + If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +to use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. diff --git a/CHANGES b/CHANGES index 3fc2757..88472ad 100644 --- a/CHANGES +++ b/CHANGES @@ -80,6 +80,7 @@ - simple automake wrapper for zlib. - splint fiddles. - make peace with gcc-3.1, remove compiler cruft. + - make peace with automake et al in 8.0, ugh. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/acconfig.h b/acconfig.h index 3fbcdbe..44ac591 100644 --- a/acconfig.h +++ b/acconfig.h @@ -12,7 +12,7 @@ a given entry is in the file. Leave the following blank line there!! Autoheader needs it. */ -^L + /* Define to the name of the distribution. */ #undef PACKAGE @@ -23,21 +23,6 @@ /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS - -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT - -/* Define to 1 if you have the stpcpy function. */ -#undef HAVE_STPCPY - -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Define as 1 if you have mntctl() (only aix?) */ #undef HAVE_MNTCTL @@ -156,7 +141,7 @@ /* Define if you have the getmntent() function */ #undef HAVE_GETMNTENT -^L + /* Leave that blank line there!! Autoheader needs it. If you're adding to this file, keep in mind: The entries are in sort -df order: alphabetical, case insensitive, diff --git a/aclocal.m4 b/aclocal.m4 index 7e3984c..b7b74dd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,70 +1,133 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +# aclocal.m4 generated automatically by aclocal 1.5 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# 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. -# serial 1 +# serial 5 + +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# 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]) -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) +# 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])])]) + +# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) +# ---------------------------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -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_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi + +# Define the identity of the package. +PACKAGE=$1 +AC_SUBST(PACKAGE)dnl +VERSION=$2 +AC_SUBST(VERSION)dnl ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) +[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) + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# 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_DEPENDENCIES(CC)], + [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 +]) # # Check to make sure that the build environment is sane. # +# serial 3 + +# AM_SANITY_CHECK +# --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -74,7 +137,7 @@ if ( alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -83,47 +146,417 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. + +# serial 2 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1="$3/missing $2" - AC_MSG_RESULT(missing) + am_missing_run= + am_backtick='`' + AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) fi -AC_SUBST($1)]) +]) + +# AM_AUX_DIR_EXPAND + +# 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/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], [ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +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)]) + +# 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 +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# 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 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# serial 4 -*- Autoconf -*- + + + +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# --------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX" 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 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +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], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + 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 && + 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 + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" +AC_SUBST([$1DEPMODE]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[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_SUBST(DEPDIR) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +pushdef([subst], defn([AC_SUBST])) +subst(AMDEPBACKSLASH) +popdef([subst]) +]) + +# Generate code to set up dependency tracking. +# This macro should only be invoked once -- use via AC_REQUIRE. +# Usage: +# AM_OUTPUT_DEPENDENCY_COMMANDS + +# +# 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 + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +], [AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir"])]) + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +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__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# 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 + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +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_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) + +# serial 3 + +# 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 +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) # Like AC_CONFIG_HEADER, but automatically create stamp file. +# serial 3 + +# 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], -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx +[ifdef([AC_FOREACH],dnl + [dnl init our file count if it isn't already + m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) + 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, [:.*])) + m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) + 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]_AM_Config_Header_Index[" +][$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<<>>dnl>>) -changequote([,]))]) + am_indx=\`expr \$am_indx + 1\` +done]) +])]) # AM_CONFIG_HEADER + +# _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 #serial 1 # This test replaces the one in autoconf. @@ -157,10 +590,10 @@ if test "$am_cv_prog_cc_stdc" != no; then else AC_MSG_RESULT(no) U=_ ANSI2KNR=./ansi2knr - # Ensure some checks needed by ansi2knr itself. - AC_HEADER_STDC - AC_CHECK_HEADERS(string.h) fi +# Ensure some checks needed by ansi2knr itself. +AC_HEADER_STDC +AC_CHECK_HEADERS(string.h) AC_SUBST(U)dnl AC_SUBST(ANSI2KNR)dnl ]) @@ -193,7 +626,7 @@ dnl like #elif. dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" @@ -201,9 +634,10 @@ ac_save_CC="$CC" # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE +# 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 "-Aa -D_HPUX_SOURCE" "-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" AC_TRY_COMPILE( @@ -245,7 +679,7 @@ CC="$ac_save_CC" if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else - AC_MSG_RESULT($am_cv_prog_cc_stdc) + AC_MSG_RESULT([$am_cv_prog_cc_stdc]) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; @@ -256,6 +690,7 @@ esac # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -381,9 +816,30 @@ _LT_AC_LTCONFIG_HACK ]) +# AC_LIBTOOL_HEADER_ASSERT +# ------------------------ +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], +[AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + +if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) +fi +])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, +AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN @@ -401,10 +857,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. -[symcode='[BCDEGRST]'] +symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' @@ -412,25 +868,29 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +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'" + # Define system-specific variables. case $host_os in aix*) - [symcode='[BCDT]'] + symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' ;; 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*) - [symcode='[BCDEGRST]'] + symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) - [symcode='[BDT]'] + symcode='[[BDT]]' ;; sysv4) - [symcode='[DFNSTU]'] + symcode='[[DFNSTU]]' ;; esac @@ -444,14 +904,14 @@ esac # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -493,23 +953,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } -[lt_preloaded_symbols[] =] +lt_preloaded_symbols[[]] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -553,10 +1013,13 @@ done global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) @@ -574,16 +1037,17 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will find an echo command which doesn;t interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) + [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. @@ -649,7 +1113,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -738,7 +1202,7 @@ AC_DIVERT_POP # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else @@ -825,7 +1289,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -847,16 +1311,22 @@ else ;; *) - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen", - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load", - [AC_CHECK_LIB(svld, dlopen, - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB(dld, shl_load, - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) ]) - ]) - ]) + ]) + ]) ]) ;; esac @@ -919,10 +1389,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. @@ -991,8 +1461,15 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. @@ -1012,7 +1489,7 @@ rmdir .libs 2>/dev/null AC_MSG_RESULT($objdir) -AC_ARG_WITH(pic, +AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default @@ -1040,7 +1517,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -1075,13 +1552,13 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -1137,9 +1614,9 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, 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' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -1206,7 +1683,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no @@ -1282,6 +1759,8 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo AC_TRY_COMPILE([], [int some_variable = 0;], [dnl # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -1291,6 +1770,7 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=yes fi ]) + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" ]) compiler_o_lo=$lt_cv_compiler_o_lo @@ -1387,7 +1867,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -1395,7 +1875,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -1482,7 +1964,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -1495,24 +1977,24 @@ EOF # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # 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 - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \[$]# in + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -1607,80 +2089,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # 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 + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[[012]]|aix4.[[012]].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -1712,11 +2210,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[[012]]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + 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' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -1791,7 +2296,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -1799,10 +2304,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -1847,10 +2366,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -1859,7 +2407,7 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in - [solaris2.[0-5] | solaris2.[0-5].*]) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac @@ -1882,7 +2430,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + 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' @@ -2039,22 +2587,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - [ aix4 | aix4.[01] | aix4.[01].*)] - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -2063,14 +2613,13 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -2101,7 +2650,7 @@ cygwin* | mingw* | pw32*) case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ @@ -2111,14 +2660,14 @@ cygwin* | mingw* | pw32*) $rm \$dlpath' ;; yes,mingw*) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + 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"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' @@ -2276,9 +2825,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -2389,6 +2948,33 @@ test "$dynamic_linker" = no && can_build_shared=no AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no @@ -2482,6 +3068,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -2548,12 +3135,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -2719,6 +3306,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -2841,9 +3431,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -3198,6 +3788,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -3211,8 +3802,8 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] + [[\\/]]* | [[A-Za-z]]:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do @@ -3236,7 +3827,7 @@ else fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -3300,7 +3891,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -3315,7 +3906,7 @@ beos*) ;; bsdi4*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3329,7 +3920,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.[012]) + rhapsody* | darwin1.[[012]]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -3344,7 +3935,7 @@ freebsd*) i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3359,7 +3950,7 @@ gnu*) ;; hpux10.20*|hpux11*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; @@ -3378,7 +3969,7 @@ irix5* | irix6*) *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` @@ -3387,30 +3978,34 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] - esac + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -3427,14 +4022,14 @@ solaris*) lt_cv_file_magic_test_file=/lib/libc.so ;; -[sysv5uw[78]* | sysv4*uw2*)] +sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) @@ -3442,11 +4037,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ;; sequent) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] + 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 ;; esac @@ -3460,13 +4055,14 @@ deplibs_check_method=$lt_cv_deplibs_check_method # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl +AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm @@ -3577,8 +4173,8 @@ 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]) -dnl From Jim Meyering. Use this if you use the GNU error.[ch]. -dnl FIXME: Migrate into libit +# From Jim Meyering. Use this if you use the GNU error.[ch]. +# FIXME: Migrate into libit AC_DEFUN([AM_FUNC_ERROR_AT_LINE], [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, @@ -3586,7 +4182,7 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE], am_cv_lib_error_at_line=yes, am_cv_lib_error_at_line=no)]) if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.o" + LIBOBJS="$LIBOBJS error.$ac_objext" fi AC_SUBST(LIBOBJS)dnl ]) @@ -3595,11 +4191,15 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE], # Ulrich Drepper , 1995. # # This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. -# serial 9 +# serial 10 dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library @@ -3710,14 +4310,14 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" AC_CHECK_FUNCS(dcgettext) LIBS="$gt_save_LIBS" + dnl Search for GNU msgfmt in the PATH. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - fi + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + dnl Search for GNU xgettext in the PATH. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) CATOBJEXT=.gmo fi @@ -3734,10 +4334,10 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) AC_SUBST(MSGFMT) BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes @@ -3746,11 +4346,26 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + AC_MSG_RESULT( + [found msgfmt program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else AC_MSG_RESULT( @@ -3774,6 +4389,9 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; /*) top_srcdir="$ac_given_srcdir" ;; @@ -3781,9 +4399,9 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" esac if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" - echo creating "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES" - echo creating "$ac_dir/Makefile" + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" fi ;; @@ -3814,7 +4432,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" dnl Found it, now check the version. AC_MSG_CHECKING([version of bison]) changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) @@ -3944,11 +4562,15 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) # Ulrich Drepper , 1996. # # This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. -# serial 1 +# serial 2 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) @@ -3980,7 +4602,7 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ;; esac])dnl $1="$ac_cv_path_$1" -if test -n "[$]$1"; then +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then AC_MSG_RESULT([$]$1) else AC_MSG_RESULT(no) @@ -4107,9 +4729,13 @@ AC_DEFUN([AM_LANGINFO_CODESET], # Ulrich Drepper , 1995. # # This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# be used in projects which are not available under the GNU General Public +# License or the GNU Library General Public License but which still want +# to provide support for the GNU gettext functionality. +# Please note that the actual code of the GNU gettext library is covered +# by the GNU Library General Public License, and the rest of the GNU +# gettext package package is covered by the GNU General Public License. +# They are *not* in the public domain. # serial 2 diff --git a/autogen.sh b/autogen.sh index 5a09e3a..ede5437 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,21 +3,21 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.4" -ACV="Autoconf version 2.13" -AMV="automake (GNU automake) 1.4-p5" +LTV="libtoolize (GNU libtool) 1.4.2" +ACV="autoconf (GNU Autoconf) 2.52" +AMV="automake (GNU automake) 1.5" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.4 - autoconf-2.13 - automake-1.4-p5 + libtool-1.4.2 + autoconf-2.52 + automake-1.5 Simply edit this script to change the libtool/autoconf/automake versions checked if you need to, as rpm should build (and has built) with all recent versions of libtool/autoconf/automake. " [ "`libtoolize --version`" != "$LTV" ] && echo "$USAGE" && exit 1 -[ "`autoconf --version`" != "$ACV" ] && echo "$USAGE" && exit 1 +[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1 (cd popt; ./autogen.sh --noconfigure "$@") diff --git a/beecrypt/COPYING b/beecrypt/COPYING index 223ede7..60549be 100644 --- a/beecrypt/COPYING +++ b/beecrypt/COPYING @@ -1,397 +1,221 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. +modification follow. - GNU LESSER GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, +identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of +on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. +entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or -collective works based on the Library. +collective works based on the Program. -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are +distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying -the Library or works based on it. +the Program or works based on it. - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with +You are not responsible for enforcing compliance by third parties to this License. - - 11. If, as a consequence of a court judgment or allegation of patent + + 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. +refrain entirely from distribution of the Program. -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is +integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that @@ -401,104 +225,116 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. NO WARRANTY - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Programs - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) 19yy - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This library is distributed in the hope that it will be useful, + 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 - Lesser General Public License for more details. + 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 Lesser General Public - License along with this library; if not, write to the Free Software + 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 + Also add information on how to contact you by electronic and paper mail. +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if +school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. - , 1 April 1990 + , 1 April 1989 Ty Coon, President of Vice -That's all there is to it! - - +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/beecrypt/INSTALL b/beecrypt/INSTALL index bca44d0..b42a17a 100644 --- a/beecrypt/INSTALL +++ b/beecrypt/INSTALL @@ -1,6 +1,8 @@ Basic Installation ================== + These are generic installation instructions. + The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. @@ -34,13 +36,7 @@ The simplest way to compile this package is: 2. Type `make' to compile the package. - If you're building GNU make on a system which does not already have - a `make', you can use the build.sh shell script to compile. Run - `sh ./build.sh'. This should compile the program in the current - directory. Then you will have a Make program that you can use for - `make install', or whatever else. - - 3. Optionally, type `./make check' to run any self-tests that come with + 3. Optionally, type `make check' to run any self-tests that come with the package. 4. Type `make install' to install the programs and any data files and @@ -184,4 +180,3 @@ operates. script, and exit. `configure' also accepts some other, not widely useful, options. - diff --git a/beecrypt/Makefile.in b/beecrypt/Makefile.in index f3ab79b..fdce22f 100644 --- a/beecrypt/Makefile.in +++ b/beecrypt/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am contains the top-level automake definitions # @@ -40,7 +43,6 @@ # 3. Interfaces removed (bad): Increment CURRENT, set AGE and REVISION to 0. # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -61,13 +63,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ @@ -76,11 +74,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -93,17 +91,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -112,6 +113,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ LIBBEECRYPT_LT_CURRENT = 4 LIBBEECRYPT_LT_AGE = 2 @@ -142,175 +146,163 @@ pkginclude_HEADERS = base64.h beecrypt.h blockmode.h blockpad.h blowfish.h blowf EXTRA_DIST = BENCHMARKS BUGS CONTRIBUTORS Doxyfile.in Doxyheader README.DLL README.WIN32 beecrypt.def beecrypt.mcp beecrypt.rc beecrypt.spec config.h config.gas.h config.win.h javaglue.h DOXYGEN = /usr/bin/doxygen +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.gnu.h -CONFIG_CLEAN_FILES = Doxyfile beecrypt.spec -LTLIBRARIES = $(lib_LTLIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I. +CONFIG_CLEAN_FILES = Doxyfile beecrypt.spec +LTLIBRARIES = $(lib_LTLIBRARIES) + +am_libbeecrypt_la_OBJECTS = base64.lo beecrypt.lo blockmode.lo \ + blockpad.lo blowfish.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo \ + dlsvdp-dh.lo dsa.lo elgamal.lo endianness.lo entropy.lo \ + fips180.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo \ + hmacsha256.lo javaglue.lo md5.lo memchunk.lo mp32.lo \ + mp32barrett.lo mp32number.lo mp32prime.lo mtprng.lo rsa.lo \ + rsakp.lo rsapk.lo sha256.lo timestamp.lo +libbeecrypt_la_OBJECTS = $(am_libbeecrypt_la_OBJECTS) + +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libbeecrypt_la_OBJECTS = base64.lo beecrypt.lo blockmode.lo blockpad.lo \ -blowfish.lo dhaes.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo \ -elgamal.lo endianness.lo entropy.lo fips180.lo fips186.lo hmac.lo \ -hmacmd5.lo hmacsha1.lo hmacsha256.lo javaglue.lo md5.lo memchunk.lo \ -mp32.lo mp32barrett.lo mp32number.lo mp32prime.lo mtprng.lo rsa.lo \ -rsakp.lo rsapk.lo sha256.lo timestamp.lo -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +depcomp = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(pkginclude_HEADERS) - -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ -Doxyfile.in INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 \ -beecrypt.spec.in config.gnu.h.in config.guess config.sub configure \ -configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libbeecrypt_la_SOURCES) +HEADERS = $(pkginclude_HEADERS) + + +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 $(pkginclude_HEADERS) ./stamp-h.in AUTHORS COPYING \ + COPYING.LIB ChangeLog Doxyfile.in INSTALL Makefile.am \ + Makefile.in NEWS acconfig.h aclocal.m4 beecrypt.spec.in \ + config.gnu.h.in config.guess config.sub configure configure.in \ + depcomp install-sh ltconfig ltmain.sh missing mkinstalldirs +DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libbeecrypt_la_SOURCES) -OBJECTS = $(libbeecrypt_la_OBJECTS) -all: all-redirect +all: config.gnu.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile +.SUFFIXES: .S .c .lo .o .obj -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +clean-libtool: + -rm -rf .libs _libs -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +distclean-libtool: + -rm -f libtool +$(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 + +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.gnu.h: stamp-h @if test ! -f $@; then \ rm -f stamp-h; \ $(MAKE) stamp-h; \ else :; fi stamp-h: $(srcdir)/config.gnu.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.gnu.h \ $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.gnu.h.in: $(srcdir)/stamp-h.in + @mv stamp-hT stamp-h +$(srcdir)/config.gnu.h.in: $(srcdir)/./stamp-h.in @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ + rm -f $(srcdir)/./stamp-h.in; \ + $(MAKE) $(srcdir)/./stamp-h.in; \ else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h + @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT + @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: + @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in distclean-hdr: -rm -f config.gnu.h - -maintainer-clean-hdr: Doxyfile: $(top_builddir)/config.status Doxyfile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status beecrypt.spec: $(top_builddir)/config.status beecrypt.spec.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -mostlyclean-libLTLIBRARIES: - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - -distclean-libLTLIBRARIES: - -maintainer-clean-libLTLIBRARIES: - + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status 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) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ + echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +libbeecrypt.la: $(libbeecrypt_la_OBJECTS) $(libbeecrypt_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libbeecrypt_la_LDFLAGS) $(libbeecrypt_la_OBJECTS) $(libbeecrypt_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: +.c.o: + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -libbeecrypt.la: $(libbeecrypt_la_OBJECTS) $(libbeecrypt_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libbeecrypt_la_LDFLAGS) $(libbeecrypt_la_OBJECTS) $(libbeecrypt_la_LIBADD) $(LIBS) +.c.obj: + $(COMPILE) -c `cygpath -w $<` +.c.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +uninstall-info-am: install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ + $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ done uninstall-pkgincludeHEADERS: @$(NORMAL_UNINSTALL) - list='$(pkginclude_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pkgincludedir)/$$p; \ + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \ + rm -f $(DESTDIR)$(pkgincludedir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd @@ -319,12 +311,7 @@ uninstall-pkgincludeHEADERS: # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: +$(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ @@ -347,11 +334,16 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ + rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ @@ -370,88 +362,71 @@ tags-recursive: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(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; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.gnu.h.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.gnu.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + fi; \ done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(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.gnu.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.gnu.h.in $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags config.gnu.h.in $$unique $(LISP) -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +top_distdir = . +# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(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 - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) +GZIP_ENV = --best + distdir: $(DISTFILES) - @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ + @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \ + then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi - -rm -rf $(distdir) + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) - -chmod 777 $(distdir) + $(mkinstalldirs) $(distdir)/. @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ @@ -459,100 +434,147 @@ distdir: $(DISTFILES) test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ || exit 1; \ fi; \ done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive + -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 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(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) + 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` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + && $(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 \ + && 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) + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -all-recursive-am: config.gnu.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive +all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.gnu.h +installdirs: installdirs-recursive +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir) -install-exec-am: install-libLTLIBRARIES +install: install-recursive install-exec: install-exec-recursive - -install-data-am: install-pkgincludeHEADERS install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS -uninstall: uninstall-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.gnu.h -all-redirect: all-recursive-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir) - +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ - mostlyclean-compile mostlyclean-libtool \ - mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive -mostlyclean: mostlyclean-recursive +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am -clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ - clean-tags clean-generic 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 +distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags -clean: clean-recursive +dvi: dvi-recursive -distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool +dvi-am: -distclean: distclean-recursive - -rm -f config.status - -maintainer-clean-am: maintainer-clean-hdr \ - maintainer-clean-libLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-recursive + +info-am: + +install-data-am: install-pkgincludeHEADERS + +install-exec-am: install-libLTLIBRARIES + +install-info: install-info-recursive + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ -clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ -uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ -distclean-compile clean-compile maintainer-clean-compile \ -mostlyclean-libtool distclean-libtool clean-libtool \ -maintainer-clean-libtool uninstall-pkgincludeHEADERS \ -install-pkgincludeHEADERS install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-pkgincludeHEADERS + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-recursive dist dist-all distcheck distclean \ + distclean-compile 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-info install-info-am install-info-recursive \ + install-libLTLIBRARIES install-man install-pkgincludeHEADERS \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-libLTLIBRARIES \ + uninstall-pkgincludeHEADERS uninstall-recursive .S.lo: $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< @@ -578,7 +600,6 @@ doxygen apidocs: Doxyfile Doxyheader rm -rf $@ mkdir -p $@ - [ -x ${DOXYGEN} ] && ${DOXYGEN} - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/beecrypt/aclocal.m4 b/beecrypt/aclocal.m4 index 21bcffb..82769da 100644 --- a/beecrypt/aclocal.m4 +++ b/beecrypt/aclocal.m4 @@ -1,70 +1,133 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +# aclocal.m4 generated automatically by aclocal 1.5 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# 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. -# serial 1 +# serial 5 -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# 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])])]) + + +# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) +# ---------------------------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -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_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi + +# Define the identity of the package. +PACKAGE=$1 +AC_SUBST(PACKAGE)dnl +VERSION=$2 +AC_SUBST(VERSION)dnl ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) +[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) + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# 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_DEPENDENCIES(CC)], + [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 +]) # # Check to make sure that the build environment is sane. # +# serial 3 + +# AM_SANITY_CHECK +# --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -74,7 +137,7 @@ if ( alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -83,51 +146,422 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. + +# serial 2 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1="$3/missing $2" - AC_MSG_RESULT(missing) + am_missing_run= + am_backtick='`' + AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) fi -AC_SUBST($1)]) +]) + +# AM_AUX_DIR_EXPAND + +# 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/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], [ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +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)]) + +# 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 +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# 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 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# serial 4 -*- Autoconf -*- + + + +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# --------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX" 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 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +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], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + 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 && + 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 + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" +AC_SUBST([$1DEPMODE]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[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_SUBST(DEPDIR) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +pushdef([subst], defn([AC_SUBST])) +subst(AMDEPBACKSLASH) +popdef([subst]) +]) + +# Generate code to set up dependency tracking. +# This macro should only be invoked once -- use via AC_REQUIRE. +# Usage: +# AM_OUTPUT_DEPENDENCY_COMMANDS + +# +# 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 + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +], [AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir"])]) + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +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__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# 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 + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +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_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) + +# serial 3 + +# 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 +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) # Like AC_CONFIG_HEADER, but automatically create stamp file. +# serial 3 + +# 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], -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx +[ifdef([AC_FOREACH],dnl + [dnl init our file count if it isn't already + m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) + 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, [:.*])) + m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) + 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]_AM_Config_Header_Index[" +][$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<<>>dnl>>) -changequote([,]))]) + am_indx=\`expr \$am_indx + 1\` +done]) +])]) # AM_CONFIG_HEADER + +# _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 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -253,9 +687,30 @@ _LT_AC_LTCONFIG_HACK ]) +# AC_LIBTOOL_HEADER_ASSERT +# ------------------------ +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], +[AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + +if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) +fi +])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, +AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN @@ -273,10 +728,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. -[symcode='[BCDEGRST]'] +symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' @@ -284,25 +739,29 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +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'" + # Define system-specific variables. case $host_os in aix*) - [symcode='[BCDT]'] + symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' ;; 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*) - [symcode='[BCDEGRST]'] + symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) - [symcode='[BDT]'] + symcode='[[BDT]]' ;; sysv4) - [symcode='[DFNSTU]'] + symcode='[[DFNSTU]]' ;; esac @@ -316,14 +775,14 @@ esac # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -365,23 +824,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } -[lt_preloaded_symbols[] =] +lt_preloaded_symbols[[]] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -425,10 +884,13 @@ done global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) @@ -446,16 +908,17 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will find an echo command which doesn;t interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) + [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. @@ -521,7 +984,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -610,7 +1073,7 @@ AC_DIVERT_POP # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else @@ -697,7 +1160,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -719,16 +1182,22 @@ else ;; *) - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen", - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load", - [AC_CHECK_LIB(svld, dlopen, - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB(dld, shl_load, - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) ]) - ]) - ]) + ]) + ]) ]) ;; esac @@ -791,10 +1260,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. @@ -863,8 +1332,15 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. @@ -884,7 +1360,7 @@ rmdir .libs 2>/dev/null AC_MSG_RESULT($objdir) -AC_ARG_WITH(pic, +AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default @@ -912,7 +1388,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -947,13 +1423,13 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -1009,9 +1485,9 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, 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' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -1078,7 +1554,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no @@ -1154,6 +1630,8 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo AC_TRY_COMPILE([], [int some_variable = 0;], [dnl # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -1163,6 +1641,7 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=yes fi ]) + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" ]) compiler_o_lo=$lt_cv_compiler_o_lo @@ -1259,7 +1738,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -1267,7 +1746,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -1354,7 +1835,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -1367,24 +1848,24 @@ EOF # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # 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 - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \[$]# in + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -1479,80 +1960,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # 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 + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[[012]]|aix4.[[012]].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -1584,11 +2081,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[[012]]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + 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' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -1663,7 +2167,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -1671,10 +2175,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -1719,10 +2237,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -1731,7 +2278,7 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in - [solaris2.[0-5] | solaris2.[0-5].*]) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac @@ -1754,7 +2301,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + 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' @@ -1911,22 +2458,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - [ aix4 | aix4.[01] | aix4.[01].*)] - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -1935,14 +2484,13 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -1973,7 +2521,7 @@ cygwin* | mingw* | pw32*) case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ @@ -1983,14 +2531,14 @@ cygwin* | mingw* | pw32*) $rm \$dlpath' ;; yes,mingw*) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + 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"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' @@ -2148,9 +2696,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -2261,6 +2819,33 @@ test "$dynamic_linker" = no && can_build_shared=no AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no @@ -2354,6 +2939,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -2420,12 +3006,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -2591,6 +3177,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -2713,9 +3302,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -3070,6 +3659,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -3083,8 +3673,8 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] + [[\\/]]* | [[A-Za-z]]:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do @@ -3108,7 +3698,7 @@ else fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -3172,7 +3762,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -3187,7 +3777,7 @@ beos*) ;; bsdi4*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3201,7 +3791,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.[012]) + rhapsody* | darwin1.[[012]]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -3216,7 +3806,7 @@ freebsd*) i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3231,7 +3821,7 @@ gnu*) ;; hpux10.20*|hpux11*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; @@ -3250,7 +3840,7 @@ irix5* | irix6*) *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` @@ -3259,30 +3849,34 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] - esac + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -3299,14 +3893,14 @@ solaris*) lt_cv_file_magic_test_file=/lib/libc.so ;; -[sysv5uw[78]* | sysv4*uw2*)] +sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) @@ -3314,11 +3908,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ;; sequent) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] + 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 ;; esac @@ -3332,13 +3926,14 @@ deplibs_check_method=$lt_cv_deplibs_check_method # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl +AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm diff --git a/beecrypt/autogen.sh b/beecrypt/autogen.sh index 2807b71..c552b4b 100755 --- a/beecrypt/autogen.sh +++ b/beecrypt/autogen.sh @@ -3,21 +3,21 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.4" -ACV="Autoconf version 2.13" -AMV="automake (GNU automake) 1.4-p5" +LTV="libtoolize (GNU libtool) 1.4.2" +ACV="autoconf (GNU Autoconf) 2.52" +AMV="automake (GNU automake) 1.5" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.4 - autoconf-2.13 - automake-1.4-p5 + libtool-1.4.2 + autoconf-2.52 + automake-1.5 Simply edit this script to change the libtool/autoconf/automake versions checked if you need to, as rpm should build (and has built) with all recent versions of libtool/autoconf/automake. " [ "`libtoolize --version`" != "$LTV" ] && echo "$USAGE" && exit 1 -[ "`autoconf --version`" != "$ACV" ] && echo "$USAGE" && exit 1 +[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1 [ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1 libtoolize --copy --force diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in index d33dbd8..a4450eb 100644 --- a/beecrypt/config.gnu.h.in +++ b/beecrypt/config.gnu.h.in @@ -1,43 +1,73 @@ /* config.gnu.h.in. Generated automatically from configure.in by autoheader. */ +/* + * acconfig.h + * + * acconfig.h pre-announces symbols defines by configure.in + * + * Copyright (c) 2001 Virtual Unlimited B.V. + * + * Author: Bob Deblier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef _REENTRANT +#define _REENTRANT +#endif -/* Define to empty if the keyword does not work. */ -#undef const +#undef PACKAGE +#undef VERSION -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline +#define AIX 0 +#define BEOS 0 +#define CYGWIN 0 +#define DARWIN 0 +#define FREEBSD 0 +#define HPUX 0 +#define LINUX 0 +#define MACOSX 0 +#define NETBSD 0 +#define OPENBSD 0 +#define OSF 0 +#define QNX 0 +#define SCO_UNIX 0 +#define SOLARIS 0 +#ifndef WIN32 +# define WIN32 0 +#endif -/* Define to `unsigned' if doesn't define. */ -#undef size_t +#define LEADING_UNDERSCORE 0 +#define NO_UNDERSCORES 0 -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +#define JAVAGLUE 0 -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +#undef HAVE_ERRNO_H +#undef HAVE_STRING_H +#undef HAVE_CTYPE_H +#undef HAVE_STDLIB_H +#undef HAVE_MTMALLOC_H -#define AIX 0 -#define BEOS 0 -#define CYGWIN 0 -#define DARWIN 0 -#define FREEBSD 0 -#define HPUX 0 -#define LINUX 0 -#define MACOSX 0 -#define NETBSD 0 -#define OPENBSD 0 -#define OSF 0 -#define QNX 0 -#define SCO_UNIX 0 -#define SOLARIS 0 -#ifndef WIN32 -# define WIN32 0 -#endif +#undef HAVE_UNISTD_H +#undef HAVE_FCNTL_H -#define LEADING_UNDERSCORE 0 -#define NO_UNDERSCORES 0 +#undef HAVE_TIME_H -#define JAVAGLUE 0 +#undef HAVE_SYS_TYPES_H +#undef HAVE_SYS_STAT_H +#undef HAVE_SYS_TIME_H #undef ENABLE_THREADS #undef HAVE_THREAD_H @@ -48,6 +78,13 @@ #undef ENABLE_AIO #undef HAVE_AIO_H +#undef HAVE_TERMIO_H +#undef HAVE_TERMIOS_H + +#undef HAVE_SYS_AUDIOIO_H +#undef HAVE_SYS_IOCTL_H +#undef HAVE_SYS_SOUNDCARD_H + #undef HAVE_GETTIMEOFDAY #undef HAVE_GETHRTIME @@ -81,120 +118,148 @@ #undef inline #endif -/* The number of bytes in a char. */ -#undef SIZEOF_CHAR - -/* The number of bytes in a double. */ -#undef SIZEOF_DOUBLE - -/* The number of bytes in a float. */ -#undef SIZEOF_FLOAT - -/* The number of bytes in a int. */ -#undef SIZEOF_INT - -/* The number of bytes in a long. */ -#undef SIZEOF_LONG - -/* The number of bytes in a long long. */ -#undef SIZEOF_LONG_LONG - -/* The number of bytes in a short. */ -#undef SIZEOF_SHORT - -/* The number of bytes in a unsigned char. */ -#undef SIZEOF_UNSIGNED_CHAR - -/* The number of bytes in a unsigned int. */ -#undef SIZEOF_UNSIGNED_INT - -/* The number of bytes in a unsigned long. */ -#undef SIZEOF_UNSIGNED_LONG - -/* The number of bytes in a unsigned long long. */ -#undef SIZEOF_UNSIGNED_LONG_LONG - -/* The number of bytes in a unsigned short. */ -#undef SIZEOF_UNSIGNED_SHORT - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_AIO_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_CTYPE_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_DLFCN_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_ERRNO_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_FCNTL_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have the `mtmalloc' library (-lmtmalloc). */ +#undef HAVE_LIBMTMALLOC + +/* Define if you have the `pthread' library (-lpthread). */ +#undef HAVE_LIBPTHREAD + +/* Define if you have the `thread' library (-lthread). */ +#undef HAVE_LIBTHREAD + +/* Define if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define if you have the header file. */ #undef HAVE_MTMALLOC_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_PTHREAD_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SEMAPHORE_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define if you have the header file. */ #undef HAVE_STDLIB_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define if you have the header file. */ #undef HAVE_STRING_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYNCH_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_AUDIOIO_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_SOUNDCARD_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ -#undef HAVE_TERMIO_H - -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_TERMIOS_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_TERMIO_H + +/* Define if you have the header file. */ #undef HAVE_THREAD_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_TIME_H -/* Define if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the mtmalloc library (-lmtmalloc). */ -#undef HAVE_LIBMTMALLOC +/* Name of package */ +#undef PACKAGE -/* Define if you have the pthread library (-lpthread). */ -#undef HAVE_LIBPTHREAD +/* The size of a `char', as computed by sizeof. */ +#undef SIZEOF_CHAR -/* Define if you have the thread library (-lthread). */ -#undef HAVE_LIBTHREAD +/* The size of a `double', as computed by sizeof. */ +#undef SIZEOF_DOUBLE -/* Name of package */ -#undef PACKAGE +/* The size of a `float', as computed by sizeof. */ +#undef SIZEOF_FLOAT + +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of a `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + +/* The size of a `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* The size of a `unsigned char', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_CHAR + +/* The size of a `unsigned int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_INT + +/* The size of a `unsigned long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG + +/* The size of a `unsigned long long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG_LONG + +/* The size of a `unsigned short', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_SHORT + +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS /* Version number of package */ #undef VERSION +/* Define if your processor stores words with the most significant byte first + (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#undef inline + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/beecrypt/config.guess b/beecrypt/config.guess index ba66165..dff9e48 100755 --- a/beecrypt/config.guess +++ b/beecrypt/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-04-20' +timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -52,7 +52,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -95,25 +95,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; if test $? = 0 ; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o $dummy.rel + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found + CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac +esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -150,6 +150,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # to ELF recently, or will in the future. case "${UNAME_MACHINE}" in i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then @@ -204,6 +205,7 @@ main: jsr \$26,exit .end main EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then case `./$dummy` in @@ -225,6 +227,9 @@ EOF 2-307) UNAME_MACHINE="alphaev67" ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; esac fi rm -f $dummy.s $dummy @@ -328,6 +333,9 @@ EOF aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -385,6 +393,7 @@ EOF echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -475,6 +484,7 @@ EOF exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -553,6 +563,7 @@ EOF fi ;; esac if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE @@ -586,9 +597,9 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -598,6 +609,7 @@ EOF echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -633,7 +645,7 @@ EOF 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -677,12 +689,13 @@ EOF echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' @@ -763,97 +776,29 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - cat >$dummy.c < /* for printf() prototype */ -int main (int argc, char *argv[]) { -#else -int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __MIPSEB__ - printf ("%s-unknown-linux-gnu\n", argv[1]); -#endif -#ifdef __MIPSEL__ - printf ("%sel-unknown-linux-gnu\n", argv[1]); -#endif - return 0; -} -EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in + big) echo mips-unknown-linux-gnu && exit 0 ;; + little) echo mipsel-unknown-linux-gnu && exit 0 ;; + esac ;; ppc:Linux:*:*) - # Determine Lib Version - cat >$dummy.c < -#if defined(__GLIBC__) -extern char __libc_version[]; -extern char __libc_release[]; -#endif -main(argc, argv) - int argc; - char *argv[]; -{ -#if defined(__GLIBC__) - printf("%s %s\n", __libc_version, __libc_release); -#else - printf("unknown\n"); -#endif - return 0; -} -EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then LIBC="libc1" ; fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) - cat <$dummy.s - .data - \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - .text - .globl main - .align 4 - .ent main - main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) UNAME_MACHINE="alpha" ;; - 1-0) UNAME_MACHINE="alphaev5" ;; - 1-1) UNAME_MACHINE="alphaev56" ;; - 1-101) UNAME_MACHINE="alphapca56" ;; - 2-303) UNAME_MACHINE="alphaev6" ;; - 2-307) UNAME_MACHINE="alphaev67" ;; - esac - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) @@ -883,40 +828,30 @@ EOF # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_emulations=`cd /; ld --help 2>&1 \ - | sed -ne '/supported emulations:/!d + ld_supported_targets=`cd /; ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i*86linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 - ;; - elf_i*86) + case "$ld_supported_targets" in + elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - i*86coff) + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 - ;; - esac - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - case "${UNAME_MACHINE}" in - i*86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; esac # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build cat >$dummy.c < #ifdef __cplusplus @@ -928,15 +863,15 @@ EOF #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); + printf ("%s-pc-linux-gnu\n", argv[1]); # else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); + printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif # else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); + printf ("%s-pc-linux-gnulibc1\n", argv[1]); # endif #else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); + printf ("%s-pc-linux-gnuaout\n", argv[1]); #endif return 0; } @@ -945,9 +880,10 @@ EOF rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) @@ -966,14 +902,13 @@ EOF echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i*86:*:5:7*) - # Fixed at (any) Pentium or better - UNAME_MACHINE=i586 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -1067,8 +1002,8 @@ EOF echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -1080,6 +1015,10 @@ EOF # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; @@ -1172,11 +1111,18 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < diff --git a/beecrypt/config.sub b/beecrypt/config.sub index a06a480..393f13d 100755 --- a/beecrypt/config.sub +++ b/beecrypt/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-04-20' +timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -117,7 +117,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -157,6 +157,14 @@ case $os in os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; @@ -215,26 +223,36 @@ esac case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ - | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ - | pj | pjl | h8500) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dsp16xx \ + | fr30 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | m32r | m68000 | m68k | m88k | mcore \ + | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el | mips64vr4300 \ + | mips64vr4300el | mips64vr5000 | mips64vr5000el \ + | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ + | mipsisa32 \ + | mn10200 | mn10300 \ + | ns16k | ns32k \ + | openrisc \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | s390 | s390x \ + | sh | sh[34] | sh[34]eb | shbe | shle \ + | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ + | stormy16 | strongarm \ + | tahoe | thumb | tic80 | tron \ + | v850 \ + | we32k \ + | x86 | xscale \ + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -242,7 +260,7 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' @@ -257,31 +275,43 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ - | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alphapca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armv*-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c54x-* \ + | clipper-* | cray2-* | cydra-* \ + | d10v-* | d30v-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | m32r-* \ + | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ + | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ + | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | s390-* | s390x-* \ + | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ + | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ + | v850-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -727,6 +757,16 @@ case $basic_machine in ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; @@ -881,6 +921,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + windows32) + basic_machine=i386-pc + os=-windows32-msvcrt + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -934,7 +978,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4) + sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) @@ -1018,11 +1062,13 @@ case $os in | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1346,6 +1392,9 @@ case $basic_machine in -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; diff --git a/beecrypt/configure b/beecrypt/configure index 96ae16e..a9c8b66 100755 --- a/beecrypt/configure +++ b/beecrypt/configure @@ -1,25 +1,12 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by Autoconf 2.52. # +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --enable-static[=PKGS] build static libraries [default=no]" -ac_help="$ac_help - --enable-shared[=PKGS] build shared libraries [default=yes]" -ac_help="$ac_help - --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" -ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" - # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. if test "X${PATH_SEPARATOR+set}" != Xset; then @@ -28,9 +15,9 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -94,7 +81,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -176,33 +163,149 @@ 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, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +exec 6>&1 + +# +# Initializations. +# +ac_default_prefix=/usr/local +cross_compiling=no +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} -ac_help="$ac_help - --disable-libtool-lock avoid locking (might break parallel builds)" -ac_help="$ac_help - --with-pic try to use only PIC/non-PIC objects [default=use both]" -ac_help="$ac_help - --enable-debug creates debugging code [default=no]" -ac_help="$ac_help - --enable-optimized enables the assembler optimizations [default depends on --enable-debug value]" -ac_help="$ac_help - --with-javaglue creates the java glue code [default=yes]" -ac_help="$ac_help - --enable-threads enables multithread safety [default=yes]" -ac_help="$ac_help - --enable-aio enables asynchronous i/o for entropy gathering [default=yes]" -ac_help="$ac_help - --with-mtmalloc links against the mtmalloc library [default=no]" +ac_unique_file="beecrypt.c" +# 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" # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -211,10 +314,15 @@ program_transform_name=s,x,x, silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -228,17 +336,16 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= ac_prev= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -246,59 +353,59 @@ do continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir="$ac_optarg" ;; + datadir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -307,95 +414,47 @@ do -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -404,12 +463,12 @@ EOF -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -430,26 +489,26 @@ EOF -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -466,7 +525,7 @@ EOF | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -476,7 +535,7 @@ EOF ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -487,58 +546,57 @@ EOF | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "with_${ac_package}='$ac_optarg'" ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -549,98 +607,98 @@ EOF ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: should be removed in autoconf 3.0. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file= +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%/[^/][^/]*$%%'` + ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -651,13 +709,327 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { (exit 1); exit 1; }; } fi fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat < if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +EOF +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue + cd $ac_subdir + # A "../" for each directory in /$ac_subdir. + ac_dots=`echo $ac_subdir | + sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + + 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 + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure.gnu; then + echo + $SHELL $ac_sub_srcdir/configure.gnu --help=recursive + elif test -f $ac_sub_srcdir/configure; then + echo + $SHELL $ac_sub_srcdir/configure --help=recursive + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 + fi + cd $ac_popdir + done +fi + +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\EOF + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +EOF + exit 0 +fi +exec 5>config.log +cat >&5 </dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +PATH = $PATH + +_ASUNAME +} >&5 + +cat >&5 <\?\"\']*) + 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, +{ + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} >&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 && + exit $exit_status + ' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h +# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -668,40 +1040,107 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" + { echo "$as_me:1043: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:1054: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi else - echo "creating cache $cache_file" - > $cache_file + { echo "$as_me:1062: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:1078: 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:1082: 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:1088: 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:1090: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:1092: 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). + 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" + ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:1111: 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:1113: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi +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:1133: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? + echo "$as_me:1136: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' else - ac_n= ac_c='\c' ac_t= + ac_path_separator=: fi - +PATH_SEPARATOR="$ac_path_separator" +rm -f conftest.sh ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -713,105 +1152,100 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { { echo "$as_me:1162: 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 -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:1172: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1176: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1185: 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:1189: 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:1194: 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:1201: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:1210: 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:1215: 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:1222: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:1231: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1236: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 +target=$ac_cv_target +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. # will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:754: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:775: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:793: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && +test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -819,31 +1253,39 @@ test "$host_alias" != "$target_alias" && # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:828: checking for a BSD compatible install" >&5 +echo "$as_me:1261: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + 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 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + 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 test -f $ac_dir/$ac_prog; then + 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 + 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 @@ -853,200 +1295,248 @@ else ;; esac done - IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:1310: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:881: checking whether build environment is sane" >&5 +echo "$as_me:1321: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # 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 "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } + { { echo "$as_me:1345: 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;} + { (exit 1); exit 1; }; } fi - test "$2" = conftestfile + test "$2" = conftest.file ) then # Ok. : else - { echo "configure: error: newly created file is older than distributed files! -Check your system clock" 1>&2; exit 1; } -fi -rm -f conftest* -echo "$ac_t""yes" 1>&6 -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed + { { echo "$as_me:1358: 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:1364: result: yes" >&5 +echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" + program_transform_name="s,^,$program_prefix,;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + program_transform_name="s,\$,$program_suffix,;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_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` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + am_backtick='`' + { echo "$as_me:1389: 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 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:1397: 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 +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:1412: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + echo "$as_me:1420: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 +else + echo "$as_me:1423: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," + test -n "$AWK" && break +done -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:938: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:1430: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftestmake <<\EOF + cat >conftest.make <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` if test -n "$ac_maketemp"; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no fi -rm -f conftestmake +rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:1450: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$as_me:1454: 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" -PACKAGE=beecrypt +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi -VERSION=2.2.0 +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 -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:1490: 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 -cat >> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <&6 -echo "configure:984: checking for working aclocal" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 -fi +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:997: checking for working autoconf" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 -fi +# Some tools Automake needs. -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1010: checking for working automake" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 -fi +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1023: checking for working autoheader" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1036: checking for working makeinfo" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi +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"} +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.gnu.h" # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then @@ -1069,302 +1559,665 @@ no) enable_static=no ;; esac else enable_static=no -fi - - +fi; case $target_os in cygwin*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define CYGWIN 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define WIN32 1 EOF ;; darwin*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define DARWIN 1 EOF ;; freebsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define FREEBSD 1 EOF ;; linux*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define LINUX 1 EOF ;; netbsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NETBSD 1 EOF ;; openbsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPENBSD 1 EOF ;; osf*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OSF 1 EOF ;; *qnx) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define QNX 1 EOF ;; solaris*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define SOLARIS 1 EOF ;; sysv*uv*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define SCO_UNIX 1 EOF ;; *) - echo "configure: warning: Operating system type $target_os currently not supported and/or tested" 1>&2 + { echo "$as_me:1630: WARNING: Operating system type $target_os currently not supported and/or tested" >&5 +echo "$as_me: WARNING: Operating system type $target_os currently not supported and/or tested" >&2;} ;; esac case $target_os in cygwin* | darwin*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define LEADING_UNDERSCORE 1 EOF ;; *) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_UNDERSCORES 1 EOF ;; esac -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1164: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:1657: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" + 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:1672: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1680: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1683: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo "$as_me:1692: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + 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:1707: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1715: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1718: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:1731: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + 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:1746: found $ac_dir/$ac_word" >&5 +break +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1754: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1757: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:1766: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + 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:1781: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1789: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1792: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC else - echo "$ac_t""no" 1>&6 + CC="$ac_cv_prog_CC" fi +fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1194: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:1805: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" + 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:1825: found $ac_dir/$ac_word" >&5 +break +done + if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# -gt 0; then + if test $# != 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" + set dummy "$ac_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi fi fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1847: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1850: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1245: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:1861: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" + 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:1876: found $ac_dir/$ac_word" >&5 +break +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1884: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + echo "$as_me:1887: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1277: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1900: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + 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:1915: found $ac_dir/$ac_word" >&5 +break +done -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1923: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1926: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -cat > conftest.$ac_ext << EOF + test -n "$ac_ct_CC" && break +done -#line 1288 "configure" + CC=$ac_ct_CC +fi + +fi + +test -z "$CC" && { { echo "$as_me:1938: error: no acceptable cc found in \$PATH" >&5 +echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:1943:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1946: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:1949: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1951: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:1954: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1956: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:1959: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +#line 1963 "configure" #include "confdefs.h" -main(){return(0);} -EOF -if { (eval echo configure:1293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe" +# 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:1979: 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:1982: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:1985: \$? = $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 + 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;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:2008: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:2014: 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:2019: 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:2025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2028: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no else - ac_cv_prog_cc_cross=yes + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:2035: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&2;} + { (exit 1); exit 1; }; } + fi fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1319: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1324: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes +echo "$as_me:2043: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext +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:2050: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:2052: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:2055: checking for executable suffix" >&5 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +if { (eval echo "$as_me:2057: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2060: \$? = $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 + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done else - ac_cv_prog_gcc=no -fi + { { echo "$as_me:2076: error: cannot compute EXEEXT: cannot compile and link" >&5 +echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } fi -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +rm -f conftest$ac_cv_exeext +echo "$as_me:2082: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 -if test $ac_cv_prog_gcc = yes; then - GCC=yes +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:2088: checking for object suffix" >&5 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - GCC= -fi + cat >conftest.$ac_ext <<_ACEOF +#line 2094 "configure" +#include "confdefs.h" -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1352: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:2106: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2109: \$? = $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_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:2121: error: cannot compute OBJEXT: cannot compile" >&5 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest* +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi +echo "$as_me:2128: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:2132: 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 2138 "configure" +#include "confdefs.h" + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2153: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2156: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2159: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2162: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +cat 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:2174: 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:2180: 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 2186 "configure" +#include "confdefs.h" + +int +main () +{ -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2198: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2201: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2204: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2207: \$? = $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 +fi +echo "$as_me:2217: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -1378,170 +2231,435 @@ else CFLAGS= fi fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2244: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2247: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2250: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2253: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line 2265 "configure" +#include "confdefs.h" +#include +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2278: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2281: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2284: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2287: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line 2297 "configure" +#include "confdefs.h" +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2309: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2312: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2315: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2318: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_config_commands="$ac_config_commands default-1" + +am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +echo "$as_me:2353: 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= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# 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 + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +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_result=BSD + fi +fi + +echo "$as_me:2380: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6 +rm -f confinc confmf + +depcc="$CC" am_compiler_list= + +echo "$as_me:2386: 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 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + 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 && + 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 + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1384: checking how to run the C preprocessor" >&5 +fi +echo "$as_me:2448: 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" + +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:2457: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2478 "configure" #include "confdefs.h" #include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : + Syntax error +_ACEOF +if { (eval echo "$as_me:2483: \"$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:2489: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2512 "configure" #include "confdefs.h" -#include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : +#include +_ACEOF +if { (eval echo "$as_me:2516: \"$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:2522: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + ac_cpp_err=yes fi -rm -f conftest* +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" + + done + ac_cv_prog_CPP=$CPP + fi - CPP="$ac_cv_prog_CPP" + CPP=$ac_cv_prog_CPP else - ac_cv_prog_CPP="$CPP" + ac_cv_prog_CPP=$CPP fi -echo "$ac_t""$CPP" 1>&6 - -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1464: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" +echo "$as_me:2559: 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. + # 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 2569 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2574: \"$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:2580: \$? = $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_cv_prog_LN_S=ln -fi + ac_cpp_err=yes fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 +if test -z "$ac_cpp_err"; then + : else - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue fi +rm -f conftest.err conftest.$ac_ext -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1485: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2603 "configure" #include "confdefs.h" - -int main() { - -#ifndef __CYGWIN__ -#define __CYGWIN__ __CYGWIN32__ -#endif -return __CYGWIN__; -; return 0; } -EOF -if { (eval echo configure:1501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes +#include +_ACEOF +if { (eval echo "$as_me:2607: \"$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:2613: \$? = $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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no + ac_cpp_err=yes fi -rm -f conftest* -rm -f conftest* +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi +rm -f conftest.err conftest.$ac_ext -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1518: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +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 - cat > conftest.$ac_ext <&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } +fi -int main() { -return __MINGW32__; -; return 0; } -EOF -if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes +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:2652: 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:2656: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* + echo "$as_me:2659: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -1563,8 +2681,7 @@ no) enable_shared=no ;; esac else enable_shared=yes -fi - +fi; # Check whether --enable-fast-install or --disable-fast-install was given. if test "${enable_fast_install+set}" = set; then enableval="$enable_fast_install" @@ -1586,6 +2703,16 @@ no) enable_fast_install=no ;; esac else enable_fast_install=yes +fi; +# Find the correct PATH separator. Usually this is `:', but +# DJGPP uses `;' like DOS. +if test "X${PATH_SEPARATOR+set}" != Xset; then + UNAME=${UNAME-`uname 2>/dev/null`} + case X$UNAME in + *-DOS) lt_cv_sys_path_separator=';' ;; + *) lt_cv_sys_path_separator=':' ;; + esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi # Check whether --with-gnu-ld or --without-gnu-ld was given. @@ -1594,13 +2721,12 @@ if test "${with_gnu_ld+set}" = set; then test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi - +fi; ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1604: checking for ld used by GCC" >&5 + echo "$as_me:2728: checking for ld used by GCC" >&5 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1629,17 +2755,17 @@ echo "configure:1604: checking for ld used by GCC" >&5 ;; esac elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1634: checking for GNU ld" >&5 + echo "$as_me:2758: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1637: checking for non-GNU ld" >&5 + echo "$as_me:2761: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -1662,15 +2788,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 + echo "$as_me:2791: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2794: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1672: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +test -z "$LD" && { { echo "$as_me:2797: 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:2800: 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 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 &5; then @@ -1679,33 +2809,32 @@ else lt_cv_prog_gnu_ld=no fi fi - -echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6 +echo "$as_me:2812: 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 $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1689: checking for $LD option to reload object files" >&5 -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2816: 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 "$ac_t""$lt_cv_ld_reload_flag" 1>&6 +echo "$as_me:2823: 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 $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1701: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2828: 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 else if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm @@ -1732,12 +2861,13 @@ fi fi NM="$lt_cv_path_NM" -echo "$ac_t""$NM" 1>&6 +echo "$as_me:2864: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6 -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1739: checking how to recognise dependant libraries" >&5 -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2867: checking how to recognise dependant libraries" >&5 +echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 +if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -1748,7 +2878,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -1777,7 +2907,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.012) + rhapsody* | darwin1.[012]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -1835,13 +2965,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; - esac + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; @@ -1859,6 +2983,16 @@ newos6*) lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1875,111 +3009,45 @@ solaris*) lt_cv_file_magic_test_file=/lib/libc.so ;; -sysv5uw[78]* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - 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 - ;; - esac - ;; -esac - -fi - -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6 -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1912: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1938: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - +sysv5uw[78]* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + 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 + ;; + esac + ;; +esac +fi +echo "$as_me:3039: 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 $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:1979: checking command to parse $NM output" >&5 -if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3045: 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 else - + # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -1995,6 +3063,9 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +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'" + # Define system-specific variables. case $host_os in aix*) @@ -2005,6 +3076,7 @@ cygwin* | mingw* | pw32*) ;; 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*) symcode='[BCDEGRST]' @@ -2051,10 +3123,18 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:2055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo "$as_me:3126: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3129: \$? = $ac_status" >&5 + (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:2058: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo "$as_me:3133: \"$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:3136: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -2076,23 +3156,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } lt_preloaded_symbols[] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -2105,7 +3185,11 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo "$as_me:3188: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3191: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2138,67 +3222,76 @@ fi global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then - echo "$ac_t""failed" 1>&6 +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then + echo "$as_me:3232: result: failed" >&5 +echo "${ECHO_T}failed" >&6 else - echo "$ac_t""ok" 1>&6 + echo "$as_me:3235: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi -for ac_hdr in dlfcn.h +for ac_header in dlfcn.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2155: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 3248 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:3252: \"$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:3258: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + 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 $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2200: checking for ${ac_tool_prefix}file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3291: 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 /*) @@ -2250,17 +3343,19 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 + echo "$as_me:3346: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3349: 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 $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2262: checking for file" >&5 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3355: 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 /*) @@ -2312,9 +3407,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$ac_t""$MAGIC_CMD" 1>&6 + echo "$as_me:3410: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3413: result: no" >&5 +echo "${ECHO_T}no" >&6 fi else @@ -2326,150 +3423,162 @@ fi ;; esac -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3429: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" + 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:3444: found $ac_dir/$ac_word" >&5 +break +done + fi fi -RANLIB="$ac_cv_prog_RANLIB" +RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 + echo "$as_me:3452: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3455: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_RANLIB"; then -if test -n "$ac_tool_prefix"; then + ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2365: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +echo "$as_me:3464: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else + 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:3479: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:3488: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3491: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + RANLIB=$ac_ct_RANLIB else - RANLIB=":" -fi + RANLIB="$ac_cv_prog_RANLIB" fi -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2400: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3503: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - break - fi - done - IFS="$ac_save_ifs" + 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:3518: found $ac_dir/$ac_word" >&5 +break +done + fi fi -STRIP="$ac_cv_prog_STRIP" +STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 + echo "$as_me:3526: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3529: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_STRIP"; then -if test -n "$ac_tool_prefix"; then + ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2432: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIP="strip" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" +echo "$as_me:3538: 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 + 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:3553: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi -STRIP="$ac_cv_prog_STRIP" -if test -n "$STRIP"; then - echo "$ac_t""$STRIP" 1>&6 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:3562: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3565: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + STRIP=$ac_ct_STRIP else - STRIP=":" -fi + STRIP="$ac_cv_prog_STRIP" fi - enable_dlopen=no enable_win32_dll=yes # Check whether --enable-libtool-lock or --disable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval="$enable_libtool_lock" - : -fi +fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -2477,8 +3586,12 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2481 "configure"' > conftest.$ac_ext - if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3589 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:3590: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3593: \$? = $ac_status" >&5 + (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2498,47 +3611,58 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2503: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3614: 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 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +ac_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 - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3627 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3639: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3642: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3648: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +lt_cv_cc_needs_belf=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +ac_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 fi - -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 +echo "$as_me:3664: 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 CFLAGS="$SAVE_CFLAGS" @@ -2546,237 +3670,270 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 ;; *-*-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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2553: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3676: 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 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - break - fi - done - IFS="$ac_save_ifs" + 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:3691: found $ac_dir/$ac_word" >&5 +break +done + fi fi -DLLTOOL="$ac_cv_prog_DLLTOOL" +DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 + echo "$as_me:3699: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3702: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_DLLTOOL"; then -if test -n "$ac_tool_prefix"; 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2585: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="dlltool" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false" +echo "$as_me:3711: 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:3726: 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 -DLLTOOL="$ac_cv_prog_DLLTOOL" -if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + echo "$as_me:3735: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3738: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + DLLTOOL=$ac_ct_DLLTOOL else - DLLTOOL="false" -fi + 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2620: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3750: 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 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ac_tool_prefix}as" - break - fi - done - IFS="$ac_save_ifs" + 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:3765: found $ac_dir/$ac_word" >&5 +break +done + fi fi -AS="$ac_cv_prog_AS" +AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 + echo "$as_me:3773: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3776: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_AS"; then -if test -n "$ac_tool_prefix"; 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2652: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="as" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false" +echo "$as_me:3785: 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:3800: 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 -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + echo "$as_me:3809: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3812: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + AS=$ac_ct_AS else - AS="false" -fi + 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2687: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3824: 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 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - break - fi - done - IFS="$ac_save_ifs" + 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:3839: found $ac_dir/$ac_word" >&5 +break +done + fi fi -OBJDUMP="$ac_cv_prog_OBJDUMP" +OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 + echo "$as_me:3847: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3850: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi if test -z "$ac_cv_prog_OBJDUMP"; then -if test -n "$ac_tool_prefix"; 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2719: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_OBJDUMP="objdump" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false" +echo "$as_me:3859: 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:3874: 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 -OBJDUMP="$ac_cv_prog_OBJDUMP" -if test -n "$OBJDUMP"; then - echo "$ac_t""$OBJDUMP" 1>&6 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + echo "$as_me:3883: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:3886: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + OBJDUMP=$ac_ct_OBJDUMP else - OBJDUMP="false" -fi + 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 $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2755: checking if libtool should supply DllMain function" >&5 -if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3897: 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 <conftest.$ac_ext <<_ACEOF +#line 3903 "configure" #include "confdefs.h" -int main() { +int +main () +{ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); -; return 0; } -EOF -if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3916: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3919: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3922: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3925: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then lt_cv_need_dllmain=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_need_dllmain=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +lt_cv_need_dllmain=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$lt_cv_need_dllmain" 1>&6 +echo "$as_me:3935: result: $lt_cv_need_dllmain" >&5 +echo "${ECHO_T}$lt_cv_need_dllmain" >&6 case $host/$CC in *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) @@ -2784,32 +3941,45 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 # require "-mdll" SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" - echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2789: checking how to link DLLs" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3944: 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 <conftest.$ac_ext <<_ACEOF +#line 3950 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3962: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3965: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3968: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3971: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then lt_cv_cc_dll_switch=-mdll else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_dll_switch=-dll + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +lt_cv_cc_dll_switch=-dll fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6 +echo "$as_me:3981: 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 @@ -2817,7 +3987,7 @@ echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6 lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; esac ;; - + esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -2895,16 +4065,23 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. set dummy $CC compiler="$2" -echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:2908: checking for objdir" >&5 +echo "$as_me:4083: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -2914,8 +4091,8 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$ac_t""$objdir" 1>&6 - +echo "$as_me:4094: result: $objdir" >&5 +echo "${ECHO_T}$objdir" >&6 # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then @@ -2923,17 +4100,16 @@ if test "${with_pic+set}" = set; then pic_mode="$withval" else pic_mode=default -fi - +fi; 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 $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:2935: checking for $compiler option to produce PIC" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4109: 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 else lt_cv_prog_cc_pic= lt_cv_prog_cc_shlib= @@ -2953,7 +4129,7 @@ else # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -2988,13 +4164,13 @@ else # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -3050,9 +4226,9 @@ else 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' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -3077,28 +4253,44 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$ac_t""none" 1>&6 + echo "$as_me:4256: result: none" >&5 +echo "${ECHO_T}none" >&6 else - echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6 + echo "$as_me:4259: 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 $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:3087: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:4263: 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 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4271 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4283: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4286: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4292: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) # On HP-UX, both CC and GCC only warn that PIC is supported... then @@ -3114,19 +4306,17 @@ if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; lt_cv_prog_cc_pic_works=yes ;; esac - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_prog_cc_pic_works=no - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + lt_cv_prog_cc_pic_works=no + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - -fi +fi if test "X$lt_cv_prog_cc_pic_works" = Xno; then lt_cv_prog_cc_pic= @@ -3135,51 +4325,68 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6 + echo "$as_me:4328: 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 "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2 + { echo "$as_me:4334: 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 "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2 + { echo "$as_me:4338: 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 $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:3153: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4344: 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 else lt_cv_prog_cc_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4353 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4365: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4368: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4371: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4374: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +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 "$ac_t""$lt_cv_prog_cc_static_works" 1>&6 +echo "$as_me:4388: 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" special_shlib_compile_flags="$lt_cv_prog_cc_shlib" @@ -3188,14 +4395,13 @@ 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 $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:3195: checking if $compiler supports -c -o file.$ac_objext" >&5 -if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4399: 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 else - + $rm -r conftest 2>/dev/null mkdir conftest cd conftest @@ -3210,7 +4416,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4419: \"$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 @@ -3234,29 +4440,46 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$ac_t""$compiler_c_o" 1>&6 +echo "$as_me:4443: 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 $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:3243: checking if $compiler supports -c -o file.lo" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:4448: 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 else - + lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4460 "configure" #include "confdefs.h" -int main() { -int some_variable = 0; -; return 0; } -EOF -if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +int +main () +{ +int some_variable = 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4472: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4475: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4478: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4481: \$? = $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 if test -s conftest.err; then @@ -3264,18 +4487,20 @@ if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; else lt_cv_compiler_o_lo=yes fi - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" - + fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$ac_t""$compiler_o_lo" 1>&6 + echo "$as_me:4502: result: $compiler_o_lo" >&5 +echo "${ECHO_T}$compiler_o_lo" >&6 else compiler_o_lo=no fi @@ -3284,17 +4509,19 @@ 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 $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:3289: checking if we can lock with hard links" >&5 + echo "$as_me:4512: 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* ln conftest.a conftest.b 2>/dev/null && hard_links=no 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 "$ac_t""$hard_links" 1>&6 + echo "$as_me:4520: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 + { echo "$as_me:4523: 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 else @@ -3303,22 +4530,36 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:3308: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:4533: 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 <conftest.$ac_ext <<_ACEOF +#line 4540 "configure" #include "confdefs.h" -int main() { +int +main () +{ int some_variable = 0; -; return 0; } -EOF -if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4552: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4561: \$? = $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 if test -s conftest.err; then @@ -3326,14 +4567,15 @@ if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; else compiler_rtti_exceptions=yes fi - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$ac_t""$compiler_rtti_exceptions" 1>&6 + echo "$as_me:4577: result: $compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' @@ -3343,8 +4585,8 @@ rm -f conftest* fi # See if the linker supports building shared libraries. -echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:3348: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:4588: 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= no_undefined_flag= @@ -3385,7 +4627,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -3393,7 +4635,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -3480,7 +4724,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -3499,18 +4743,18 @@ EOF # 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 - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \$# in - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \$# in + 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -3605,80 +4849,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # 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 + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -3710,11 +4970,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + 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' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -3789,7 +5056,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -3797,10 +5064,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -3845,10 +5126,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [12].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -3880,7 +5190,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + 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' @@ -3955,12 +5265,13 @@ else ;; esac fi -echo "$ac_t""$ld_shlibs" 1>&6 +echo "$as_me:5268: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:3964: checking how to hardcode library paths into programs" >&5 +echo "$as_me:5273: 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" || \ test -n "$runpath_var"; then @@ -3983,26 +5294,29 @@ else # directories. hardcode_action=unsupported fi -echo "$ac_t""$hardcode_action" 1>&6 +echo "$as_me:5297: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 striplib= old_striplib= -echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:3992: checking whether stripping libraries is possible" >&5 +echo "$as_me:5302: 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 "$ac_t""yes" 1>&6 + echo "$as_me:5307: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:5310: result: no" >&5 +echo "${ECHO_T}no" >&6 fi 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 $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:4006: checking dynamic linker characteristics" >&5 +echo "$as_me:5318: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' soname_spec= @@ -4040,22 +5354,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -4064,7 +5380,6 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; @@ -4277,9 +5592,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -4383,13 +5708,46 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$ac_t""$dynamic_linker" 1>&6 +echo "$as_me:5711: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. -echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:4392: checking if libtool supports shared libraries" >&5 -echo "$ac_t""$can_build_shared" 1>&6 +echo "$as_me:5716: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +echo "$as_me:5718: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6 + +echo "$as_me:5721: 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 + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +echo "$as_me:5742: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6 + +echo "$as_me:5745: 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:5749: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6 if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -4426,224 +5784,345 @@ else ;; *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4431: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + echo "$as_me:5787: 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 - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4469: checking for dlopen" >&5 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5793 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ + 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 dlopen(); - -int main() { + 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_dlopen) || defined (__stub___dlopen) +#if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else -dlopen(); +f = shl_load; #endif -; return 0; } -EOF -if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dlopen=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5833: \$? = $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 +ac_cv_func_shl_load=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:5843: 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 "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4515: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:5848: 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 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5856 "configure" +#include "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 shl_load (); +int +main () +{ +shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5878: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5884: \$? = $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 +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:5895: 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:5900: 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 5906 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ + 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 shl_load(); - -int main() { + 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_shl_load) || defined (__stub___shl_load) +#if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else -shl_load(); +f = dlopen; #endif -; return 0; } -EOF -if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5940: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5946: \$? = $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 +ac_cv_func_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:5956: 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 "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shl_load=no" -fi -rm -f conftest* -fi + echo "$as_me:5961: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 5969 "configure" +#include "confdefs.h" -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5988: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5991: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5994: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5997: \$? = $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 +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:6008: 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 "$ac_t""no" 1>&6 -echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:4561: checking for dlopen in -lsvld" >&5 -ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6013: 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 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6021 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen(); - -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:4580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6040: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6043: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6046: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6049: \$? = $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 +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:6060: 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 "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:4599: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6065: 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 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6073 "configure" #include "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 shl_load(); - -int main() { -shl_load() -; return 0; } -EOF -if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + builtin and then its argument prototype would still apply. */ +char dld_link (); +int +main () +{ +dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6092: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6095: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6101: \$? = $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 +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:6112: 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 -rm -f conftest* -LIBS="$ac_save_LIBS" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" -else - echo "$ac_t""no" 1>&6 -fi - fi - fi - fi - fi ;; @@ -4666,10 +6145,10 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4671: checking whether a program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6148: 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 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross @@ -4677,7 +6156,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo "$as_me:6220: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6223: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4753,17 +6236,16 @@ EOF fi rm -fr conftest* - fi - -echo "$ac_t""$lt_cv_dlopen_self" 1>&6 +echo "$as_me:6240: 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 $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4765: checking whether a statically linked program can dlopen itself" >&5 -if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6245: 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 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross @@ -4771,7 +6253,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo "$as_me:6317: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6320: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4847,10 +6333,9 @@ EOF fi rm -fr conftest* - fi - -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 +echo "$as_me:6337: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi CPPFLAGS="$save_CPPFLAGS" @@ -4870,7 +6355,6 @@ echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 esac fi - if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in *'~'*) @@ -4880,15 +6364,19 @@ 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 $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:4885: checking whether -lc should be explicitly linked in" >&5 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6367: 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 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:4892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo "$as_me:6375: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6378: \$? = $ac_status" >&5 + (exit $ac_status); }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -4901,7 +6389,11 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:4905: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo "$as_me:6392: \"$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:6395: \$? = $ac_status" >&5 + (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no else @@ -4913,7 +6405,8 @@ else fi fi - echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6 + echo "$as_me:6408: result: $lt_cv_archive_cmds_need_lc" >&5 +echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac fi @@ -4953,6 +6446,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -5019,12 +6513,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -5190,6 +6684,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -5312,9 +6809,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -5465,10 +6962,6 @@ EOF chmod +x "$ofile" fi - - - - # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -5477,110 +6970,203 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Prevent multiple expansion +echo "$as_me:6973: 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 6981 "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:7030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7033: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7039: \$? = $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:7056: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:7059: 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 $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5485: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7064: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7072 "configure" #include "confdefs.h" +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif -int main() { -} $ac_kw foo() { -; return 0; } -EOF -if { (eval echo configure:5499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7081: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7084: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7087: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7090: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done fi - -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in +echo "$as_me:7101: 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 -#define inline + no) +cat >>confdefs.h <<\EOF +#define inline EOF ;; - *) cat >> confdefs.h <>confdefs.h <&6 -echo "configure:5527: checking whether we are using Sun Workshop C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_SUNPRO_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "$ac_cv_c_compiler_gnu" != yes; then + echo "$as_me:7117: checking whether we are using Sun Workshop C" >&5 +echo $ECHO_N "checking whether we are using Sun Workshop C... $ECHO_C" >&6 +if test "${ac_cv_prog_SUNPRO_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7124 "configure" #include "confdefs.h" #ifdef __SUNPRO_C yes; #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_SUNPRO_CC=yes else - rm -rf conftest* ac_cv_prog_SUNPRO_CC=no fi rm -f conftest* - fi - -echo "$ac_t""$ac_cv_prog_SUNPRO_CC" 1>&6 +echo "$as_me:7141: result: $ac_cv_prog_SUNPRO_CC" >&5 +echo "${ECHO_T}$ac_cv_prog_SUNPRO_CC" >&6 if test "$ac_cv_prog_SUNPRO_CC" != yes; then - echo $ac_n "checking whether we are using Compaq's C compiler""... $ac_c" 1>&6 -echo "configure:5557: checking whether we are using Compaq's C compiler" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DECC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7144: checking whether we are using Compaq's C compiler" >&5 +echo $ECHO_N "checking whether we are using Compaq's C compiler... $ECHO_C" >&6 +if test "${ac_cv_prog_DECC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7151 "configure" #include "confdefs.h" #ifdef __DECC yes; #endif - -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_DECC=yes else - rm -rf conftest* ac_cv_prog_DECC=no fi rm -f conftest* - fi - -echo "$ac_t""$ac_cv_prog_DECC" 1>&6 +echo "$as_me:7168: result: $ac_cv_prog_DECC" >&5 +echo "${ECHO_T}$ac_cv_prog_DECC" >&6 fi fi @@ -5592,11 +7178,10 @@ if test "${enable_debug+set}" = set; then else ac_enable_debug=yes fi - + else ac_enable_debug=no -fi - +fi; # Check whether --enable-optimized or --disable-optimized was given. if test "${enable_optimized+set}" = set; then @@ -5606,16 +7191,15 @@ if test "${enable_optimized+set}" = set; then else ac_enable_optimized=yes fi - + else if test "$ac_enable_debug" = no; then ac_enable_optimized=yes else ac_enable_optimized=no fi - -fi +fi; # Check whether --with-javaglue or --without-javaglue was given. if test "${with_javaglue+set}" = set; then @@ -5625,81 +7209,86 @@ if test "${with_javaglue+set}" = set; then else ac_with_javaglue=yes fi - -else - ac_with_javaglue=yes -fi +else + ac_with_javaglue=yes +fi; if test "$ac_with_javaglue" = yes ; then # Extract the first word of "java", so it can be a program name with args. set dummy java; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5639: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ac_cv_have_java'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7220: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_cv_have_java+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_cv_have_java"; then ac_cv_prog_ac_cv_have_java="$ac_cv_have_java" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_ac_cv_have_java="yes" - break - fi - done - IFS="$ac_save_ifs" + 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_cv_have_java="yes" +echo "$as_me:7235: found $ac_dir/$ac_word" >&5 +break +done + test -z "$ac_cv_prog_ac_cv_have_java" && ac_cv_prog_ac_cv_have_java="no" fi fi -ac_cv_have_java="$ac_cv_prog_ac_cv_have_java" +ac_cv_have_java=$ac_cv_prog_ac_cv_have_java if test -n "$ac_cv_have_java"; then - echo "$ac_t""$ac_cv_have_java" 1>&6 + echo "$as_me:7244: result: $ac_cv_have_java" >&5 +echo "${ECHO_T}$ac_cv_have_java" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7247: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$ac_cv_have_java" = yes; then # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5670: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ac_cv_have_javac'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7254: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_cv_have_javac+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_cv_have_javac"; then ac_cv_prog_ac_cv_have_javac="$ac_cv_have_javac" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_ac_cv_have_javac="yes" - break - fi - done - IFS="$ac_save_ifs" + 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_cv_have_javac="yes" +echo "$as_me:7269: found $ac_dir/$ac_word" >&5 +break +done + test -z "$ac_cv_prog_ac_cv_have_javac" && ac_cv_prog_ac_cv_have_javac="no" fi fi -ac_cv_have_javac="$ac_cv_prog_ac_cv_have_javac" +ac_cv_have_javac=$ac_cv_prog_ac_cv_have_javac if test -n "$ac_cv_have_javac"; then - echo "$ac_t""$ac_cv_have_javac" 1>&6 + echo "$as_me:7278: result: $ac_cv_have_javac" >&5 +echo "${ECHO_T}$ac_cv_have_javac" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7281: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$ac_cv_have_javac" = yes; then - echo $ac_n "checking for java native interface headers""... $ac_c" 1>&6 -echo "configure:5699: checking for java native interface headers" >&5 -if eval "test \"`echo '$''{'ac_cv_java_include'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7286: checking for java native interface headers" >&5 +echo $ECHO_N "checking for java native interface headers... $ECHO_C" >&6 +if test "${ac_cv_java_include+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cat > conftest.java << EOF public class conftest { @@ -5728,35 +7317,38 @@ EOF if test -d "$ac_cv_java_include" ; then ac_cv_java_headers=yes else - echo "configure: warning: java headers not found, disabling javaglue" 1>&2 + { echo "$as_me:7320: WARNING: java headers not found, disabling javaglue" >&5 +echo "$as_me: WARNING: java headers not found, disabling javaglue" >&2;} ac_cv_java_headers=no ac_with_javaglue=no fi fi rm -fr conftest* - -fi -echo "$ac_t""$ac_cv_java_include" 1>&6 +fi +echo "$as_me:7329: result: $ac_cv_java_include" >&5 +echo "${ECHO_T}$ac_cv_java_include" >&6 else - echo "configure: warning: javac not found, disabling javaglue" 1>&2 + { echo "$as_me:7332: WARNING: javac not found, disabling javaglue" >&5 +echo "$as_me: WARNING: javac not found, disabling javaglue" >&2;} ac_cv_java_headers=no ac_with_javaglue=no fi else - echo "configure: warning: java not found, disabling javaglue" 1>&2 + { echo "$as_me:7338: WARNING: java not found, disabling javaglue" >&5 +echo "$as_me: WARNING: java not found, disabling javaglue" >&2;} ac_cv_java_headers=no ac_with_javaglue=no fi fi if test "$ac_with_javaglue" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define JAVAGLUE 1 EOF else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define JAVAGLUE 0 EOF @@ -5770,11 +7362,10 @@ if test "${enable_threads+set}" = set; then else ac_enable_threads=yes fi - -else - ac_enable_threads=yes -fi +else + ac_enable_threads=yes +fi; # Check whether --enable-aio or --disable-aio was given. if test "${enable_aio+set}" = set; then @@ -5784,11 +7375,10 @@ if test "${enable_aio+set}" = set; then else ac_enable_aio=yes fi - -else - ac_enable_aio=yes -fi +else + ac_enable_aio=yes +fi; # Check whether --with-mtmalloc or --without-mtmalloc was given. if test "${with_mtmalloc+set}" = set; then @@ -5798,131 +7388,155 @@ if test "${with_mtmalloc+set}" = set; then else ac_with_mtmalloc=yes fi - -else - ac_with_mtmalloc=no -fi - - +else + ac_with_mtmalloc=no +fi; +echo "$as_me:7396: 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 7402 "configure" +#include "confdefs.h" +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5813: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <j = 5; + ; + return 0; } -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} - -; return 0; } -EOF -if { (eval echo configure:5867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7460: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7463: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7469: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 +echo "$as_me:7479: 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 + +cat >>confdefs.h <<\EOF +#define const EOF fi -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5888: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7489: 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 <conftest.$ac_ext <<_ACEOF +#line 7495 "configure" #include "confdefs.h" #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +_ACEOF +if { (eval echo "$as_me:7503: \"$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:7509: \$? = $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 "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +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 <conftest.$ac_ext <<_ACEOF +#line 7531 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -5931,16 +7545,16 @@ 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 <conftest.$ac_ext <<_ACEOF +#line 7549 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -5949,461 +7563,654 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7570 "configure" #include "confdefs.h" #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +#if ((' ' & 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 -EOF -if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +#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:7596: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7599: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:7601: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7604: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + 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 -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +echo "$as_me:7617: 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 <<\EOF #define STDC_HEADERS 1 EOF fi -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5992: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7639 "configure" #include "confdefs.h" -#include -#if STDC_HEADERS -#include -#include -#endif +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7654: \$? = $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:7664: 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 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + +fi +done + +echo "$as_me:7674: 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 7680 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:7695: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:7701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_size_t=yes else - rm -rf conftest* - ac_cv_type_size_t=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_size_t=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF +echo "$as_me:7714: 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 <&6 -echo "configure:6026: checking for 8-bit clean memcmp" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7726: checking for working memcmp" >&5 +echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 +if test "${ac_cv_func_memcmp_working+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_clean=no + ac_cv_func_memcmp_working=no else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7735 "configure" #include "confdefs.h" -main() +int +main () { - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); -} - -EOF -if { (eval echo configure:6044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_func_memcmp_clean=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_memcmp_clean=no -fi -rm -fr conftest* -fi - -fi -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" + /* Some versions of memcmp are not 8-bit clean. */ + char c0 = 0x40, c1 = 0x80, c2 = 0x81; + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) + exit (1); + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes + or more and with at least one buffer not starting on a 4-byte boundary. + William Lewis provided this test program. */ + { + char foo[21]; + char bar[21]; + int i; + for (i = 0; i < 4; i++) + { + char *a = foo + i; + char *b = bar + i; + strcpy (a, "--------01111111"); + strcpy (b, "--------10000000"); + if (memcmp (a, b, 16) >= 0) + exit (1); + } + exit (0); + } -for ac_hdr in errno.h string.h ctype.h stdlib.h + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:7771: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7774: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:7776: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7779: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memcmp_working=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_func_memcmp_working=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:7791: result: $ac_cv_func_memcmp_working" >&5 +echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 +test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext" + +for ac_header in errno.h string.h ctype.h stdlib.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6066: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7804 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7808: \"$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:7814: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -for ac_hdr in unistd.h fcntl.h +for ac_header in unistd.h fcntl.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6106: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7852 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7856: \"$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:7862: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -for ac_hdr in sys/types.h sys/stat.h +for ac_header in sys/types.h sys/stat.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6146: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7900 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7904: \"$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:7910: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -for ac_hdr in termio.h termios.h +for ac_header in termio.h termios.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6186: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7948 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7952: \"$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:7958: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -for ac_hdr in sys/audioio.h sys/ioctl.h sys/soundcard.h +for ac_header in sys/audioio.h sys/ioctl.h sys/soundcard.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6226: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 7996 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8000: \"$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:8006: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - -for ac_hdr in time.h sys/time.h +for ac_header in time.h sys/time.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6267: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 8044 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8048: \"$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:8054: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done if test "$ac_cv_header_sys_time_h" = yes; then - echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 -echo "configure:6305: checking for gettimeofday" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8084: checking for gettimeofday" >&5 +echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 +if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8090 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday(); below. */ + which can conflict with char gettimeofday (); 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 gettimeofday(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gettimeofday (); +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_gettimeofday) || defined (__stub___gettimeofday) choke me #else -gettimeofday(); +f = gettimeofday; #endif -; return 0; } -EOF -if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gettimeofday=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gettimeofday=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8121: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8124: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8127: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8130: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gettimeofday=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8140: result: $ac_cv_func_gettimeofday" >&5 +echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 +if test $ac_cv_func_gettimeofday = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF - -else - echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for gethrtime""... $ac_c" 1>&6 -echo "configure:6358: checking for gethrtime" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethrtime'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:8150: checking for gethrtime" >&5 +echo $ECHO_N "checking for gethrtime... $ECHO_C" >&6 +if test "${ac_cv_func_gethrtime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8156 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethrtime(); below. */ + which can conflict with char gethrtime (); 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 gethrtime(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gethrtime (); +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_gethrtime) || defined (__stub___gethrtime) choke me #else -gethrtime(); +f = gethrtime; #endif -; return 0; } -EOF -if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethrtime=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethrtime=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'gethrtime`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8187: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8190: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8193: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8196: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethrtime=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethrtime=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8206: result: $ac_cv_func_gethrtime" >&5 +echo "${ECHO_T}$ac_cv_func_gethrtime" >&6 +if test $ac_cv_func_gethrtime = yes; then + + cat >>confdefs.h <<\EOF #define HAVE_GETHRTIME 1 EOF - -else - echo "$ac_t""no" 1>&6 fi fi @@ -6413,131 +8220,170 @@ case $target_os in ;; *) if test "$ac_enable_threads" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ENABLE_THREADS 1 EOF - for ac_hdr in thread.h pthread.h synch.h semaphore.h +for ac_header in thread.h pthread.h synch.h semaphore.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6425: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 8236 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8240: \"$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:8246: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done if test "$ac_cv_header_thread_h" = yes; then - echo $ac_n "checking for -lthread""... $ac_c" 1>&6 -echo "configure:6463: checking for -lthread" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_thread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:8277: checking for main in -lthread" >&5 +echo $ECHO_N "checking for main in -lthread... $ECHO_C" >&6 +if test "${ac_cv_lib_thread_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lthread $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8285 "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_thread=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_thread=no -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -echo "$ac_t""$ac_cv_lib_thread" 1>&6 -if test "$ac_cv_lib_thread" = yes; then - cat >> confdefs.h <<\EOF +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8297: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8300: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8303: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8306: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_thread_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_thread_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8317: result: $ac_cv_lib_thread_main" >&5 +echo "${ECHO_T}$ac_cv_lib_thread_main" >&6 +if test $ac_cv_lib_thread_main = yes; then + cat >>confdefs.h <&6 -echo "configure:6502: checking for -lpthread" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_pthread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:8331: checking for main in -lpthread" >&5 +echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 +if test "${ac_cv_lib_pthread_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8339 "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:6516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_pthread=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_pthread=no -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -echo "$ac_t""$ac_cv_lib_pthread" 1>&6 -if test "$ac_cv_lib_pthread" = yes; then - cat >> confdefs.h <<\EOF +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8351: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8354: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8357: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8360: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pthread_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pthread_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8371: result: $ac_cv_lib_pthread_main" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 +if test $ac_cv_lib_pthread_main = yes; then + cat >>confdefs.h <&2 - cat >> confdefs.h <<\EOF + { echo "$as_me:8384: WARNING: Can't find any thread libraries" >&5 +echo "$as_me: WARNING: Can't find any thread libraries" >&2;} + cat >>confdefs.h <<\EOF #define ENABLE_THREADS 0 EOF @@ -6545,125 +8391,174 @@ EOF fi if test "$ac_enable_aio" = yes; then - for ac_hdr in aio.h + +for ac_header in aio.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6553: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 8404 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8408: \"$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:8414: \$? = $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" else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done if test "$ac_cv_header_aio_h" = yes; then - -echo $ac_n "checking for library containing aio_read""... $ac_c" 1>&6 -echo "configure:6592: checking for library containing aio_read" >&5 -if eval "test \"`echo '$''{'ac_cv_search_aio_read'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_func_search_save_LIBS="$LIBS" -ac_cv_search_aio_read="no" -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for library containing aio_read... $ECHO_C" >&6 +if test "${ac_cv_search_aio_read+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_aio_read=no +cat >conftest.$ac_ext <<_ACEOF +#line 8452 "configure" #include "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 aio_read(); - -int main() { -aio_read() -; return 0; } -EOF -if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + builtin and then its argument prototype would still apply. */ +char aio_read (); +int +main () +{ +aio_read (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8471: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8474: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8477: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8480: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_search_aio_read="none required" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* -test "$ac_cv_search_aio_read" = "no" && for i in c rt aio posix4; do -LIBS="-l$i $ac_func_search_save_LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8492 "configure" #include "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 aio_read(); - -int main() { -aio_read() -; return 0; } -EOF -if { (eval echo configure:6632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_aio_read="-l$i" + builtin and then its argument prototype would still apply. */ +char aio_read (); +int +main () +{ +aio_read (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8514: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8520: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_aio_read="-l$ac_lib" break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* -done -LIBS="$ac_func_search_save_LIBS" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done fi - -echo "$ac_t""$ac_cv_search_aio_read" 1>&6 -if test "$ac_cv_search_aio_read" != "no"; then +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:8533: result: $ac_cv_search_aio_read" >&5 +echo "${ECHO_T}$ac_cv_search_aio_read" >&6 +if test "$ac_cv_search_aio_read" != no; then test "$ac_cv_search_aio_read" = "none required" || LIBS="$ac_cv_search_aio_read $LIBS" - -else : - - { echo "configure: error: no library containing aio routines found" 1>&2; exit 1; } - -fi - echo $ac_n "checking whether aio works""... $ac_c" 1>&6 -echo "configure:6655: checking whether aio works" >&5 -if eval "test \"`echo '$''{'ac_cv_have_working_aio'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - + +else + + { { echo "$as_me:8540: error: no library containing aio routines found" >&5 +echo "$as_me: error: no library containing aio routines found" >&2;} + { (exit 1); exit 1; }; } + +fi + + echo "$as_me:8546: checking whether aio works" >&5 +echo $ECHO_N "checking whether aio works... $ECHO_C" >&6 +if test "${ac_cv_have_working_aio+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.aio << EOF The quick brown fox jumps over the lazy dog. EOF if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:8556: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8561 "configure" #include "confdefs.h" #if HAVE_ERRNO_H @@ -6734,26 +8629,34 @@ main() exit(0); } - -EOF -if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:8635: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8638: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:8640: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8643: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_have_working_aio=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_have_working_aio=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_have_working_aio=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi - -echo "$ac_t""$ac_cv_have_working_aio" 1>&6 +echo "$as_me:8656: result: $ac_cv_have_working_aio" >&5 +echo "${ECHO_T}$ac_cv_have_working_aio" >&6 if test "$ac_cv_have_working_aio" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ENABLE_AIO 1 EOF @@ -6763,83 +8666,106 @@ EOF fi if test "$ac_with_mtmalloc" = yes; then - for ac_hdr in mtmalloc.h + +for ac_header in mtmalloc.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6771: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&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 8679 "configure" #include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8683: \"$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:8689: \$? = $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 - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + eval "$as_ac_Header=no" fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - echo $ac_n "checking for -lmtmalloc""... $ac_c" 1>&6 -echo "configure:6808: checking for -lmtmalloc" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_mtmalloc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8718: checking for main in -lmtmalloc" >&5 +echo $ECHO_N "checking for main in -lmtmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_mtmalloc_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lmtmalloc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8726 "configure" #include "confdefs.h" -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_mtmalloc=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_mtmalloc=no -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -echo "$ac_t""$ac_cv_lib_mtmalloc" 1>&6 -if test "$ac_cv_lib_mtmalloc" = yes; then - cat >> confdefs.h <<\EOF +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8738: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8741: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mtmalloc_main=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mtmalloc_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8758: result: $ac_cv_lib_mtmalloc_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mtmalloc_main" >&6 +if test $ac_cv_lib_mtmalloc_main = yes; then + cat >>confdefs.h < flag" 1>&2 + { echo "$as_me:8956: WARNING: please add appropriate -I$ac_cv_java_include/ flag" >&5 +echo "$as_me: WARNING: please add appropriate -I$ac_cv_java_include/ flag" >&2;} ;; esac fi -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:7037: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8962: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8970 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif -; return 0; } -EOF -if { (eval echo configure:7055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8987: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8990: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8996: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9000 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ #if BYTE_ORDER != BIG_ENDIAN not big endian #endif -; return 0; } -EOF -if { (eval echo configure:7070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9017: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9020: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9023: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9026: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_bigendian=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_bigendian=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:9042: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9047 "configure" #include "confdefs.h" -main () { +int +main () +{ /* Are we little or big endian? From Harbison&Steele. */ union { @@ -7098,679 +9058,3087 @@ main () { u.l = 1; exit (u.c[sizeof (long) - 1] == 1); } -EOF -if { (eval echo configure:7103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:9063: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9066: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9071: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_bigendian=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_bigendian=yes fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +echo "$as_me:9084: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 if test $ac_cv_c_bigendian = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define WORDS_BIGENDIAN 1 EOF fi - -echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:7128: checking size of char" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:9094: checking for char" >&5 +echo $ECHO_N "checking for char... $ECHO_C" >&6 +if test "${ac_cv_type_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 9100 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((char *) 0) + return 0; +if (sizeof (char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9118: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9121: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9124: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_char=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_char=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:9134: result: $ac_cv_type_char" >&5 +echo "${ECHO_T}$ac_cv_type_char" >&6 + +echo "$as_me:9137: checking size of char" >&5 +echo $ECHO_N "checking size of char... $ECHO_C" >&6 +if test "${ac_cv_sizeof_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_char" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 9146 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (char)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9172 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9187: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9193: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9209 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(char)); - return(0); +int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_char=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9221: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9224: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9230: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 9246 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9258: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9261: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9264: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9267: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_char=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_char=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:9280: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 9285 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (char))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:9301: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9304: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9306: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9309: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_char=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_char" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_char" >&6 +cat >>confdefs.h <&6 -echo "configure:7167: checking size of unsigned char" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_char'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:9331: checking for unsigned char" >&5 +echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 9337 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((unsigned char *) 0) + return 0; +if (sizeof (unsigned char)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9352: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9355: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9358: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9361: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_unsigned_char=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_unsigned_char=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:9371: result: $ac_cv_type_unsigned_char" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6 + +echo "$as_me:9374: checking size of unsigned char" >&5 +echo $ECHO_N "checking size of unsigned char... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_unsigned_char" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 9383 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned char)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9395: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9398: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9401: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9404: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9409 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9421: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9424: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9427: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9430: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9446 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(unsigned char)); - return(0); +int _array_ [1 - 2 * !((sizeof (unsigned char)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_char=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9458: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9461: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9464: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9467: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 9483 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned char)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9495: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9498: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9501: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9504: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_unsigned_char=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_char=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:9517: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 9522 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (unsigned char))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:9538: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9541: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9546: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_char=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_char=0 fi - fi -echo "$ac_t""$ac_cv_sizeof_unsigned_char" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_char" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT8_TYPE char EOF else - { echo "configure: error: compiler has no 1 byte char" 1>&2; exit 1; } + { { echo "$as_me:9574: error: compiler has no 1 byte char" >&5 +echo "$as_me: error: compiler has no 1 byte char" >&2;} + { (exit 1); exit 1; }; } fi if test "$ac_cv_sizeof_unsigned_char" -eq 1; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT8_TYPE unsigned char EOF else - { echo "configure: error: compiler has no 1 byte unsigned char" 1>&2; exit 1; } + { { echo "$as_me:9584: error: compiler has no 1 byte unsigned char" >&5 +echo "$as_me: error: compiler has no 1 byte unsigned char" >&2;} + { (exit 1); exit 1; }; } +fi + +echo "$as_me:9589: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6 +if test "${ac_cv_type_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9595 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((short *) 0) + return 0; +if (sizeof (short)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9610: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9613: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9619: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_short=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_short=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:9629: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6 + +echo "$as_me:9632: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6 +if test "${ac_cv_sizeof_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_short" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 9641 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (short)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9653: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9656: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9662: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9667 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9679: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9682: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9688: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9704 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (short)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9716: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9719: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9725: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 9741 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9753: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9756: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9759: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9762: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_short=$ac_lo +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:9775: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 9780 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (short))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:9796: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9799: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:9801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9804: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_short=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_short=0 +fi +fi +echo "$as_me:9820: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +cat >>confdefs.h <&5 +echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9832 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((unsigned short *) 0) + return 0; +if (sizeof (unsigned short)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9847: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9850: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_unsigned_short=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_unsigned_short=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:9866: result: $ac_cv_type_unsigned_short" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6 + +echo "$as_me:9869: checking size of unsigned short" >&5 +echo $ECHO_N "checking size of unsigned short... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_short+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_unsigned_short" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 9878 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned short)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9890: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9904 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned short)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9919: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9922: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9925: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 9941 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned short)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9953: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9956: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9962: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done fi - -echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:7223: checking size of short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 9978 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned short)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9990: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9993: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9999: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_unsigned_short=$ac_lo else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:10012: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10017 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(short)); - return(0); +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (unsigned short))); +fclose (f); + ; + return 0; } -EOF -if { (eval echo configure:7242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_short=`cat conftestval` +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10033: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10036: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10038: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10041: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_short=`cat conftest.val` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_short=0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -cat >> confdefs.h <&6 -echo "configure:7262: checking size of unsigned short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -else - cat > conftest.$ac_ext < -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(unsigned short)); - return(0); -} -EOF -if { (eval echo configure:7281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_short=`cat conftestval` +rm -f conftest.val else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* ac_cv_sizeof_unsigned_short=0 fi -rm -fr conftest* -fi - fi -echo "$ac_t""$ac_cv_sizeof_unsigned_short" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_short" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT16_TYPE short EOF else - { echo "configure: error: compiler has no 2 byte short" 1>&2; exit 1; } + { { echo "$as_me:10069: error: compiler has no 2 byte short" >&5 +echo "$as_me: error: compiler has no 2 byte short" >&2;} + { (exit 1); exit 1; }; } fi if test "$ac_cv_sizeof_unsigned_short" -eq 2; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT16_TYPE unsigned short EOF else - { echo "configure: error: compiler has no 2 byte unsigned short" 1>&2; exit 1; } + { { echo "$as_me:10079: error: compiler has no 2 byte unsigned short" >&5 +echo "$as_me: error: compiler has no 2 byte unsigned short" >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:7318: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:10084: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6 +if test "${ac_cv_type_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 10090 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((int *) 0) + return 0; +if (sizeof (int)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10105: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10108: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10111: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10114: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_int=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_int=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:10124: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6 + +echo "$as_me:10127: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6 +if test "${ac_cv_sizeof_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_int" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 10136 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (int)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10148: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10151: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10157: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10162 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10174: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10177: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10180: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10183: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10199 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(int)); - return(0); +int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10211: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10214: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10217: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10220: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 10236 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10251: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10254: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10257: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_int=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:10270: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 10275 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (int))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10291: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10294: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_int=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +cat >>confdefs.h <&6 -echo "configure:7357: checking size of unsigned int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:10321: checking for unsigned int" >&5 +echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 10327 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((unsigned int *) 0) + return 0; +if (sizeof (unsigned int)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10345: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10348: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10351: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_unsigned_int=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_unsigned_int=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:10361: result: $ac_cv_type_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6 + +echo "$as_me:10364: checking size of unsigned int" >&5 +echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_unsigned_int" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 10373 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned int)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10385: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10388: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10391: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10394: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10399 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned int)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10411: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10414: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10417: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10420: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10436 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(unsigned int)); - return(0); +int _array_ [1 - 2 * !((sizeof (unsigned int)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_int=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10448: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10451: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10454: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10457: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 10473 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned int)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10488: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10494: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_unsigned_int=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_int=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:10507: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 10512 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (unsigned int))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10528: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10531: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_int=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_int=0 fi - fi -echo "$ac_t""$ac_cv_sizeof_unsigned_int" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6 +cat >>confdefs.h <&6 -echo "configure:7396: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:10558: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 +if test "${ac_cv_type_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 10564 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((long *) 0) + return 0; +if (sizeof (long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10579: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10582: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10585: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10588: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_long=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:10598: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 + +echo "$as_me:10601: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_long" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 10610 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10622: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10625: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10631: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10636 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10648: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10651: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10654: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10657: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10673 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long)); - return(0); +int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10685: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10688: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10694: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 10710 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_long=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:10744: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 10749 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (long))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:10765: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10768: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:10770: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10773: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +cat >>confdefs.h <&6 -echo "configure:7435: checking size of unsigned long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:10795: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 10801 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((unsigned long *) 0) + return 0; +if (sizeof (unsigned long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10819: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10822: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10825: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_unsigned_long=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_unsigned_long=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:10835: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 + +echo "$as_me:10838: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_unsigned_long" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 10847 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10859: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10862: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10868: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10873 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10885: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10888: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10891: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10894: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 10910 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(unsigned long)); - return(0); +int _array_ [1 - 2 * !((sizeof (unsigned long)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_long=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 10947 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10962: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10968: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_unsigned_long=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_long=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:10981: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 10986 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (unsigned long))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11002: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11005: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11007: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11010: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_long=0 fi - fi -echo "$ac_t""$ac_cv_sizeof_unsigned_long" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT32_TYPE int EOF elif test "$ac_cv_sizeof_long" -eq 4; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT32_TYPE long EOF else - { echo "configure: error: compiler has no 4 byte integer" 1>&2; exit 1; } + { { echo "$as_me:11043: error: compiler has no 4 byte integer" >&5 +echo "$as_me: error: compiler has no 4 byte integer" >&2;} + { (exit 1); exit 1; }; } fi if test "$ac_cv_sizeof_unsigned_int" -eq 4; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT32_TYPE unsigned int EOF elif test "$ac_cv_sizeof_unsigned_long" -eq 4; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT32_TYPE unsigned long EOF else - { echo "configure: error: compiler has no 4 byte unsigned integer" 1>&2; exit 1; } + { { echo "$as_me:11058: error: compiler has no 4 byte unsigned integer" >&5 +echo "$as_me: error: compiler has no 4 byte unsigned integer" >&2;} + { (exit 1); exit 1; }; } fi if test "$ac_cv_sizeof_long" -eq 8; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT64_TYPE long EOF else - echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:7507: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:11069: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 11075 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((long long *) 0) + return 0; +if (sizeof (long long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11090: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11093: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11096: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11099: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long_long=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_long_long=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11109: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 + +echo "$as_me:11112: checking size of long long" >&5 +echo $ECHO_N "checking size of long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_long_long" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 11121 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long long)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11133: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11136: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11139: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11142: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11147 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11159: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11162: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11165: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11168: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11184 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(long long)); - return(0); +int _array_ [1 - 2 * !((sizeof (long long)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_long_long=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11199: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11202: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11205: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 11221 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11233: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11236: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11239: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11242: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_long_long=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_long_long=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:11255: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 11260 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (long long))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11276: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11279: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_LONG_LONG 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define INT64_TYPE long long EOF else - { echo "configure: error: compiler has no 8 byte integer" 1>&2; exit 1; } + { { echo "$as_me:11316: error: compiler has no 8 byte integer" >&5 +echo "$as_me: error: compiler has no 8 byte integer" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$ac_cv_sizeof_unsigned_long" -eq 8; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT64_TYPE unsigned long EOF else - echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:7565: checking size of unsigned long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:11327: 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 11333 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((unsigned long long *) 0) + return 0; +if (sizeof (unsigned long long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11348: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11351: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11354: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11357: \$? = $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 +ac_cv_type_unsigned_long_long=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11367: result: $ac_cv_type_unsigned_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 + +echo "$as_me:11370: checking size of unsigned long long" >&5 +echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_unsigned_long_long" = yes; then if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 11379 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long long)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11394: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11400: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11405 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11417: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11420: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11423: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11426: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done else - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11442 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(unsigned long long)); - return(0); +int _array_ [1 - 2 * !((sizeof (unsigned long long)) >= $ac_mid)] + ; + return 0; } -EOF -if { (eval echo configure:7584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_long_long=`cat conftestval` +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11454: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11457: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11460: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11463: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 11479 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (unsigned long long)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11491: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11494: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11497: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11500: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_unsigned_long_long=$ac_lo else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_long_long=0 + if test "$cross_compiling" = yes; then + { { echo "$as_me:11513: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 11518 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (unsigned long long))); +fclose (f); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11534: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11537: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11539: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11542: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_long_long=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_long_long=0 fi - fi -echo "$ac_t""$ac_cv_sizeof_unsigned_long_long" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_UNSIGNED_LONG_LONG 1 EOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define UINT64_TYPE unsigned long long EOF else - { echo "configure: error: compiler has no 8 byte unsigned integer" 1>&2; exit 1; } + { { echo "$as_me:11574: error: compiler has no 8 byte unsigned integer" >&5 +echo "$as_me: error: compiler has no 8 byte unsigned integer" >&2;} + { (exit 1); exit 1; }; } fi fi - -echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:7618: checking size of float" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:11580: checking for float" >&5 +echo $ECHO_N "checking for float... $ECHO_C" >&6 +if test "${ac_cv_type_float+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11586 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((float *) 0) + return 0; +if (sizeof (float)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11604: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11610: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_float=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_float=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11620: result: $ac_cv_type_float" >&5 +echo "${ECHO_T}$ac_cv_type_float" >&6 + +echo "$as_me:11623: checking size of float" >&5 +echo $ECHO_N "checking size of float... $ECHO_C" >&6 +if test "${ac_cv_sizeof_float+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_float" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 11632 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (float)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11644: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11647: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11650: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11653: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11658 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (float)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11670: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11673: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11676: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11679: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11695 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (float)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11707: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11710: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11713: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11716: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 11732 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (float)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11744: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11747: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11750: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11753: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_float=$ac_lo else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:11766: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 11771 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(float)); - return(0); +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (float))); +fclose (f); + ; + return 0; } -EOF -if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_float=`cat conftestval` +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11790: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11792: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11795: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_float=`cat conftest.val` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_float=0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$ac_t""$ac_cv_sizeof_float" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_float" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define FLOAT4_TYPE float EOF else - { echo "configure: error: compiler has no 4 byte float" 1>&2; exit 1; } + { { echo "$as_me:11823: error: compiler has no 4 byte float" >&5 +echo "$as_me: error: compiler has no 4 byte float" >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:7666: checking size of double" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:11828: checking for double" >&5 +echo $ECHO_N "checking for double... $ECHO_C" >&6 +if test "${ac_cv_type_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11834 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((double *) 0) + return 0; +if (sizeof (double)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11849: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11852: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11855: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11858: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_double=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_double=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:11868: result: $ac_cv_type_double" >&5 +echo "${ECHO_T}$ac_cv_type_double" >&6 + +echo "$as_me:11871: checking size of double" >&5 +echo $ECHO_N "checking size of double... $ECHO_C" >&6 +if test "${ac_cv_sizeof_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_double" = yes; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +#line 11880 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (double)) >= 0)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11895: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11901: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11906 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (double)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11921: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11927: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +#line 11943 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (double)) >= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11958: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11964: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +#line 11980 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +int _array_ [1 - 2 * !((sizeof (double)) <= $ac_mid)] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11995: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11998: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12001: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +ac_cv_sizeof_double=$ac_lo else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:12014: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 12019 "configure" #include "confdefs.h" -#include -int main() +$ac_includes_default +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof(double)); - return(0); +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (double))); +fclose (f); + ; + return 0; } -EOF -if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_double=`cat conftestval` +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:12035: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12038: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:12040: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12043: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_double=`cat conftest.val` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_double=0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val +else + ac_cv_sizeof_double=0 fi - fi -echo "$ac_t""$ac_cv_sizeof_double" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_sizeof_double" >&6 +cat >>confdefs.h <> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define DOUBLE8_TYPE double EOF else - { echo "configure: error: compiler has no 8 byte double" 1>&2; exit 1; } + { { echo "$as_me:12071: error: compiler has no 8 byte double" >&5 +echo "$as_me: error: compiler has no 8 byte double" >&2;} + { (exit 1); exit 1; }; } fi -echo "checking for specific entropy devices" 1>&6 -echo "configure:7714: checking for specific entropy devices" >&5 +{ echo "$as_me:12076: checking for specific entropy devices..." >&5 +echo "$as_me: checking for specific entropy devices..." >&6;} case $target_os in cygwin*) - echo $ac_n "checking for wavein""... $ac_c" 1>&6 -echo "configure:7718: checking for wavein" >&5 - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for wincrypt""... $ac_c" 1>&6 -echo "configure:7721: checking for wincrypt" >&5 - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for console""... $ac_c" 1>&6 -echo "configure:7724: checking for console" >&5 - echo "$ac_t""yes" 1>&6 + echo "$as_me:12080: checking for wavein" >&5 +echo $ECHO_N "checking for wavein... $ECHO_C" >&6 + echo "$as_me:12082: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:12084: checking for wincrypt" >&5 +echo $ECHO_N "checking for wincrypt... $ECHO_C" >&6 + echo "$as_me:12086: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:12088: checking for console" >&5 +echo $ECHO_N "checking for console... $ECHO_C" >&6 + echo "$as_me:12090: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ;; linux*) - echo $ac_n "checking for /dev/dsp""... $ac_c" 1>&6 -echo "configure:7729: checking for /dev/dsp" >&5 -if eval "test \"`echo '$''{'ac_cv_have_dev_dsp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:12094: checking for /dev/dsp" >&5 +echo $ECHO_N "checking for /dev/dsp... $ECHO_C" >&6 +if test "${ac_cv_have_dev_dsp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test -r /dev/dsp; then ac_cv_have_dev_dsp=yes else ac_cv_have_dev_dsp=no fi - -fi -echo "$ac_t""$ac_cv_have_dev_dsp" 1>&6 +fi +echo "$as_me:12107: result: $ac_cv_have_dev_dsp" >&5 +echo "${ECHO_T}$ac_cv_have_dev_dsp" >&6 if test "$ac_cv_have_dev_dsp" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_DEV_DSP 1 EOF fi ;; solaris*) - echo $ac_n "checking for /dev/audio""... $ac_c" 1>&6 -echo "configure:7752: checking for /dev/audio" >&5 -if eval "test \"`echo '$''{'ac_cv_have_dev_audio'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:12117: checking for /dev/audio" >&5 +echo $ECHO_N "checking for /dev/audio... $ECHO_C" >&6 +if test "${ac_cv_have_dev_audio+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test -r /dev/audio; then ac_cv_have_dev_audio=yes else ac_cv_have_dev_audio=no fi - -fi -echo "$ac_t""$ac_cv_have_dev_audio" 1>&6 +fi +echo "$as_me:12130: result: $ac_cv_have_dev_audio" >&5 +echo "${ECHO_T}$ac_cv_have_dev_audio" >&6 if test "$ac_cv_have_dev_audio" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_DEV_AUDIO 1 EOF fi ;; *) - echo "configure: warning: no specific entropy devices present" 1>&2 + { echo "$as_me:12140: WARNING: no specific entropy devices present" >&5 +echo "$as_me: WARNING: no specific entropy devices present" >&2;} ;; esac @@ -7778,67 +12146,67 @@ case $target_os in cygwin*) ;; *) - echo "checking for generic entropy devices" 1>&6 -echo "configure:7783: checking for generic entropy devices" >&5 - echo $ac_n "checking for /dev/random""... $ac_c" 1>&6 -echo "configure:7785: checking for /dev/random" >&5 -if eval "test \"`echo '$''{'ac_cv_have_dev_random'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - + { echo "$as_me:12149: checking for generic entropy devices..." >&5 +echo "$as_me: checking for generic entropy devices..." >&6;} + echo "$as_me:12151: checking for /dev/random" >&5 +echo $ECHO_N "checking for /dev/random... $ECHO_C" >&6 +if test "${ac_cv_have_dev_random+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -r /dev/random; then ac_cv_have_dev_random=yes else ac_cv_have_dev_random=no fi - -fi -echo "$ac_t""$ac_cv_have_dev_random" 1>&6 +fi +echo "$as_me:12164: result: $ac_cv_have_dev_random" >&5 +echo "${ECHO_T}$ac_cv_have_dev_random" >&6 if test "$ac_cv_have_dev_random" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_DEV_RANDOM 1 EOF fi - echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 -echo "configure:7806: checking for /dev/urandom" >&5 -if eval "test \"`echo '$''{'ac_cv_have_dev_urandom'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:12172: checking for /dev/urandom" >&5 +echo $ECHO_N "checking for /dev/urandom... $ECHO_C" >&6 +if test "${ac_cv_have_dev_urandom+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test -r /dev/urandom; then ac_cv_have_dev_urandom=yes else ac_cv_have_dev_urandom=no fi - -fi -echo "$ac_t""$ac_cv_have_dev_urandom" 1>&6 +fi +echo "$as_me:12185: result: $ac_cv_have_dev_urandom" >&5 +echo "${ECHO_T}$ac_cv_have_dev_urandom" >&6 if test "$ac_cv_have_dev_urandom" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_DEV_URANDOM 1 EOF fi - echo $ac_n "checking for /dev/tty""... $ac_c" 1>&6 -echo "configure:7827: checking for /dev/tty" >&5 -if eval "test \"`echo '$''{'ac_cv_have_dev_tty'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:12193: checking for /dev/tty" >&5 +echo $ECHO_N "checking for /dev/tty... $ECHO_C" >&6 +if test "${ac_cv_have_dev_tty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test -r /dev/tty; then ac_cv_have_dev_tty=yes else ac_cv_have_dev_tty=no fi - -fi -echo "$ac_t""$ac_cv_have_dev_tty" 1>&6 +fi +echo "$as_me:12206: result: $ac_cv_have_dev_tty" >&5 +echo "${ECHO_T}$ac_cv_have_dev_tty" >&6 if test "$ac_cv_have_dev_tty" = yes; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define HAVE_DEV_TTY 1 EOF @@ -7882,7 +12250,7 @@ EOF #include "gas/mp32opt.powerpc.S" EOF ;; - sparcv8) + sparcv8) cat > $srcdir/mp32opt.S << EOF #include "gas/mp32opt.sparcv8.S" EOF @@ -7907,408 +12275,953 @@ if test ! -r $srcdir/mp32opt.S; then EOF fi -trap '' 1 2 15 -cat > confcache <<\EOF +ac_config_files="$ac_config_files Doxyfile Makefile beecrypt.spec docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile tests/Makefile" +ac_config_commands="$ac_config_commands default" +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overriden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' fi -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - DEFS=-DHAVE_CONFIG_H -# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +SHELL=\${CONFIG_SHELL-$SHELL} +ac_cs_invocation="\$0 \$@" + +_ACEOF + +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 + +# 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; } + +exec 6>&1 + +_ACEOF + +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\EOF + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." +EOF + +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 do - case "\$ac_option" in + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift + ;; + -*);; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_need_defaults=false;; + esac + + case $1 in + # Handling of the options. +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:12535: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + shift + CONFIG_FILES="$CONFIG_FILES $1" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" + ac_need_defaults=false;; + + # This is an error. + -*) { { echo "$as_me:12554: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + esac + shift done -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" +exec 5>>config.log +cat >&5 << _ACEOF -trap 'rm -fr `echo " Doxyfile Makefile beecrypt.spec - docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile - tests/Makefile config.gnu.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@ACLOCAL@%$ACLOCAL%g -s%@AUTOCONF@%$AUTOCONF%g -s%@AUTOMAKE@%$AUTOMAKE%g -s%@AUTOHEADER@%$AUTOHEADER%g -s%@MAKEINFO@%$MAKEINFO%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@LN_S@%$LN_S%g -s%@OBJEXT@%$OBJEXT%g -s%@EXEEXT@%$EXEEXT%g -s%@ECHO@%$ECHO%g -s%@RANLIB@%$RANLIB%g -s%@STRIP@%$STRIP%g -s%@DLLTOOL@%$DLLTOOL%g -s%@AS@%$AS%g -s%@OBJDUMP@%$OBJDUMP%g -s%@LIBTOOL@%$LIBTOOL%g -s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g -s%@ac_cv_have_java@%$ac_cv_have_java%g -s%@ac_cv_have_javac@%$ac_cv_have_javac%g -s%@LD@%$LD%g -s%@LIBOBJS@%$LIBOBJS%g +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` -CEOF +_ACEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS < conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi +AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir" + +EOF + +cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "Doxyfile" ) CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "beecrypt.spec" ) CONFIG_FILES="$CONFIG_FILES beecrypt.spec" ;; + "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "gas/Makefile" ) CONFIG_FILES="$CONFIG_FILES gas/Makefile" ;; + "masm/Makefile" ) CONFIG_FILES="$CONFIG_FILES masm/Makefile" ;; + "mwerks/Makefile" ) CONFIG_FILES="$CONFIG_FILES mwerks/Makefile" ;; + "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "config.gnu.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.gnu.h" ;; + *) { { echo "$as_me:12610: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi + +# 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/csXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/cs$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} + +EOF + +cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@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,@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,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;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 +s,@AUTOHEADER@,$AUTOHEADER,;t t +s,@MAKEINFO@,$MAKEINFO,;t t +s,@AMTAR@,$AMTAR,;t t +s,@install_sh@,$install_sh,;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,@am__include@,$am__include,;t t +s,@am__quote@,$am__quote,;t t +s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@CPP@,$CPP,;t t +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,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t +s,@ac_cv_have_java@,$ac_cv_have_java,;t t +s,@ac_cv_have_javac@,$ac_cv_have_javac,;t t +s,@LD@,$LD,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +CEOF + EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi +fi # test -n "$CONFIG_FILES" -CONFIG_FILES=\${CONFIG_FILES-"Doxyfile Makefile beecrypt.spec - docs/Makefile gas/Makefile masm/Makefile mwerks/Makefile - tests/Makefile "} EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +cat >>$CONFIG_STATUS <<\EOF +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 - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + { 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'` + ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else ac_dir_suffix= ac_dots= fi - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + 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 ;; *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; + ac_srcdir=$ac_dots$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_dots$srcdir ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_dots$INSTALL ;; esac - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac + if test x"$ac_file" != x-; then + { echo "$as_me:12866: 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." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:12884: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:12897: 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 <<\EOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + +done +EOF +cat >>$CONFIG_STATUS <<\EOF - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* +# +# CONFIG_HEADER section. +# # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' +ac_uD=',;t' -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr + test x"$ac_file" != x- && { echo "$as_me:12958: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:12969: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:12982: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +EOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `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 +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +EOF +# 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. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +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.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +cat >>conftest.undefs <<\EOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, EOF -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. +# 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 there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS +# Break up conftest.undefs 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 #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while : +while grep . conftest.undefs >/dev/null do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\EOF + # 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. */ + if test x"$ac_file" = x-; then + echo "/* Generated automatically by configure. */" >$tmp/config.h else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + echo "/* $ac_file. Generated automatically 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:13099: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" + { 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; } + + fi + rm -f $ac_file + mv $tmp/config.h $ac_file fi - rm -f $ac_file - mv conftest.h $ac_file + else + cat $tmp/config.h + rm -f $tmp/config.h fi -fi; done - + # Run the commands associated with the file. + case $ac_file in + config.gnu.h ) # update the timestamp +echo timestamp >"./stamp-h1" + ;; + esac +done EOF -cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# +# CONFIG_COMMANDS section. +# +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue + ac_dest=`echo "$ac_file" | sed 's,:.*,,'` + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` + + 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 + 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"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + default ) + echo timestamp > stamp-h.in + ;; + esac +done EOF -cat >> $CONFIG_STATUS <<\EOF -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - - echo timestamp > stamp-h.in - +cat >>$CONFIG_STATUS <<\EOF -exit 0 +{ (exit 0); exit 0; } EOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + exec 5>/dev/null + $SHELL $CONFIG_STATUS || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi diff --git a/beecrypt/configure.in b/beecrypt/configure.in index e6adfe2..5c7fc2a 100644 --- a/beecrypt/configure.in +++ b/beecrypt/configure.in @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script dnl Initialization -AC_INIT() +AC_INIT(beecrypt.c) AC_CANONICAL_SYSTEM - -dnl Automake AM_INIT_AUTOMAKE(beecrypt, 2.2.0) AM_CONFIG_HEADER(config.gnu.h) + +dnl Automake AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL diff --git a/beecrypt/depcomp b/beecrypt/depcomp new file mode 100755 index 0000000..6589965 --- /dev/null +++ b/beecrypt/depcomp @@ -0,0 +1,411 @@ +#! /bin/sh + +# depcomp - compile a program generating dependencies as side-effects +# Copyright 1999, 2000 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. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi +# `libtool' can also be set to `yes' or `no'. + +depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. This file always lives in the current directory. + # Also, the AIX compiler puts `$object:' at the start of each line; + # $object doesn't have directory information. + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + + tmpdepfile1="$object.d" + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then + "$@" -Wc,-MD + else + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + else + tmpdepfile="$tmpdepfile2" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a space and a tab in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + test -z "$dashmflag" && dashmflag=-M + ( IFS=" " + case " $* " in + *" --mode=compile "*) # this is libtool, let us make it quiet + for arg + do # cycle over the arguments + case "$arg" in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + # X makedepend + ( + shift + cleared=no + for arg in "$@"; do + case $cleared in no) + set ""; shift + cleared=yes + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift;; + -*) + ;; + *) + set fnord "$@" "$arg"; shift;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tail +3 "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 diff --git a/beecrypt/docs/Makefile.in b/beecrypt/docs/Makefile.in index f6d2d99..f4f4973 100644 --- a/beecrypt/docs/Makefile.in +++ b/beecrypt/docs/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am's purpose is to add the documentation html files to the dist # @@ -32,7 +35,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -53,13 +55,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -68,11 +66,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,17 +83,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -104,109 +105,138 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnu no-dependencies EXTRA_DIST = index.html installing.html using.html developing.html api.html manual.css +subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.gnu.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - +CONFIG_HEADER = $(top_builddir)/config.gnu.h +CONFIG_CLEAN_FILES = +depcomp = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = docs +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic distclean-libtool -distclean-am: distclean-generic clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/beecrypt/gas/Makefile.in b/beecrypt/gas/Makefile.in index c4842ca..6ec0172 100644 --- a/beecrypt/gas/Makefile.in +++ b/beecrypt/gas/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am's purpose is to add the GNU Assembler sources to the dist # @@ -32,7 +35,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -53,13 +55,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -68,11 +66,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,17 +83,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -104,109 +105,138 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnu no-dependencies EXTRA_DIST = blowfishopt.i586.S fips180opt.i586.S mp32opt.arm.S mp32opt.i386.S mp32opt.ia64.S mp32opt.powerpc.S mp32opt.sparcv8.S mp32opt.sparcv9.S mp64opt.ia64.S +subdir = gas mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.gnu.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - +CONFIG_HEADER = $(top_builddir)/config.gnu.h +CONFIG_CLEAN_FILES = +depcomp = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu gas/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gas/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = gas +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic distclean-libtool -distclean-am: distclean-generic clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/beecrypt/install-sh b/beecrypt/install-sh index 67c9429..e9de238 100755 --- a/beecrypt/install-sh +++ b/beecrypt/install-sh @@ -1,15 +1,27 @@ -#! /bin/sh +#!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5. +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script @@ -106,6 +118,7 @@ if [ x"$dir_arg" != x ]; then if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi @@ -115,7 +128,7 @@ else # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f "$src" -o -d "$src" ] + if [ -f $src -o -d $src ] then true else @@ -212,7 +225,7 @@ else # Move or copy the file name to the temp name - $doit $instcmd "$src" $dsttmp && + $doit $instcmd $src $dsttmp && trap "rm -f ${dsttmp}" 0 && diff --git a/beecrypt/ltmain.sh b/beecrypt/ltmain.sh index 2393e14..1113682 100644 --- a/beecrypt/ltmain.sh +++ b/beecrypt/ltmain.sh @@ -55,8 +55,8 @@ modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.4 -TIMESTAMP=" (1.920 2001/04/24 23:26:18)" +VERSION=1.4.2 +TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" default_mode= help="Try \`$progname --help' for more information." @@ -84,6 +84,9 @@ if test "${LANG+set}" = set; then save_LANG="$LANG"; LANG=C; export LANG fi +# Make sure IFS has a sensible default +: ${IFS=" "} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then echo "$modename: not configured to build any kind of library" 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 @@ -202,6 +205,11 @@ if test -n "$prevopt"; then exit 1 fi +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + if test -z "$show_help"; then # Infer the operation mode. @@ -329,7 +337,7 @@ if test -z "$show_help"; then -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= - IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' + save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" @@ -615,6 +623,10 @@ compiler." # Now arrange that obj and lo_libobj become the same file $show "(cd $xdir && $LN_S $baseobj $libobj)" if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi exit 0 else error=$? @@ -1031,6 +1043,17 @@ compiler." # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; esac fi deplibs="$deplibs $arg" @@ -1122,7 +1145,7 @@ compiler." -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= - IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' + save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in @@ -1140,7 +1163,7 @@ compiler." -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= - IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' + save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in @@ -1280,11 +1303,11 @@ compiler." output_objdir="$output_objdir/$objdir" fi # Create the object directory. - if test ! -d $output_objdir; then + if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? - if test $status -ne 0 && test ! -d $output_objdir; then + if test "$status" -ne 0 && test ! -d "$output_objdir"; then exit $status fi fi @@ -1478,7 +1501,7 @@ compiler." continue ;; esac # case $deplib - if test $found = yes || test -f "$lib"; then : + if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 @@ -1650,7 +1673,7 @@ compiler." -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? - if test $linkalldeplibs = yes; then + if test "$linkalldeplibs" = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths @@ -1750,7 +1773,7 @@ compiler." if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" @@ -1763,7 +1786,7 @@ compiler." # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" @@ -1775,7 +1798,7 @@ compiler." # make sure the library variables are pointing to the new library dir=$output_objdir linklib=$newlib - fi # test -n $old_archive_from_expsyms_cmds + fi # test -n "$old_archive_from_expsyms_cmds" if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= @@ -1911,17 +1934,17 @@ compiler." echo "*** Therefore, libtool will create a static module, that should work " echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes + build_libtool_libs=module + build_old_libs=yes else - build_libtool_libs=no + build_libtool_libs=no fi fi else @@ -1934,8 +1957,8 @@ compiler." if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || - test $link_static = yes; }; then + { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || + test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -2150,7 +2173,7 @@ compiler." fi set dummy $rpath - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi install_libdir="$2" @@ -2175,7 +2198,7 @@ compiler." else # Parse the version information argument. - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' + save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" @@ -2191,7 +2214,7 @@ compiler." # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2200,7 +2223,7 @@ compiler." esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2209,7 +2232,7 @@ compiler." esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2217,7 +2240,7 @@ compiler." ;; esac - if test $age -gt $current; then + if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 @@ -2256,7 +2279,7 @@ compiler." # Add in all the interfaces that we are compatible with. loop=$revision - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` verstring="sgi$major.$iface:$verstring" @@ -2279,7 +2302,7 @@ compiler." # Add in all the interfaces that we are compatible with. loop=$age - while test $loop != 0; do + while test "$loop" -ne 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` verstring="$verstring:${iface}.0" @@ -2312,6 +2335,16 @@ compiler." if test -z "$vinfo" && test -n "$release"; then major= verstring="0.0" + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring="" + ;; + *) + verstring="0.0" + ;; + esac if test "$need_version" = no; then versuffix= else @@ -2370,7 +2403,7 @@ compiler." *) finalize_rpath="$finalize_rpath $libdir" ;; esac done - if test $hardcode_into_libs != yes || test $build_old_libs = yes; then + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi @@ -2408,6 +2441,9 @@ compiler." *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then @@ -2451,12 +2487,12 @@ compiler." EOF $rm conftest $CC -o conftest conftest.c $deplibs - if test $? -eq 0 ; then + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then + if test "$name" != "" -a "$name" -ne "0"; then libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` set dummy $deplib_matches @@ -2481,11 +2517,11 @@ EOF for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then + if test "$name" != "" -a "$name" != "0"; then $rm conftest $CC -o conftest conftest.c $i # Did it work? - if test $? -eq 0 ; then + if test "$?" -eq 0 ; then ldd_output=`ldd conftest` libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` @@ -2521,7 +2557,7 @@ EOF for a_deplib in $deplibs; do name="`expr $a_deplib : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then + if test "$name" != "" -a "$name" != "0"; then libname=`eval \\$echo \"$libname_spec\"` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` @@ -2544,6 +2580,13 @@ EOF *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done + # It is ok to link against an archive when + # building a shared library. + if $AR -t $potlib > /dev/null 2>&1; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then @@ -2656,7 +2699,7 @@ EOF echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test $allow_undefined = no; then + if test "$allow_undefined" = no; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" @@ -2784,7 +2827,7 @@ EOF export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2814,7 +2857,7 @@ EOF $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -2833,7 +2876,7 @@ EOF $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -2860,7 +2903,7 @@ EOF else eval cmds=\"$archive_cmds\" fi - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2953,7 +2996,7 @@ EOF $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -2972,7 +3015,7 @@ EOF $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -2988,7 +3031,7 @@ EOF output="$obj" eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3024,7 +3067,7 @@ EOF reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3287,27 +3330,25 @@ extern \"C\" { #undef lt_preloaded_symbols #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } lt_preloaded_symbols[] = {\ " - sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ - -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ - < "$nlist" >> "$output_objdir/$dlsyms" + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; /* This works around a problem in FreeBSD linker */ @@ -3369,7 +3410,7 @@ static const void *lt_preloaded_setup() { finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi - if test $need_relink = no || test "$build_libtool_libs" != yes; then + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" @@ -3494,7 +3535,7 @@ static const void *lt_preloaded_setup() { relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done - relink_command="cd `pwd`; $relink_command" + relink_command="(cd `pwd`; $relink_command)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi @@ -3618,8 +3659,9 @@ else # relink executable if necessary if test -n \"\$relink_command\"; then - if (eval \$relink_command); then : + if relink_command_output=\`eval \$relink_command 2>&1\`; then : else + $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" exit 1 fi @@ -3736,7 +3778,7 @@ fi\ $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test $status -ne 0 && test ! -d "$gentop"; then + if test "$status" -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -3756,7 +3798,7 @@ fi\ $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test $status -ne 0 && test ! -d "$xdir"; then + if test "$status" -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -3790,7 +3832,7 @@ fi\ eval cmds=\"$old_archive_cmds\" fi - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3823,7 +3865,7 @@ fi\ fi done # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -3913,7 +3955,7 @@ dlpreopen='$dlprefiles' # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test $need_relink = yes; then + if test "$installed" = no && test "$need_relink" = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" fi @@ -4049,7 +4091,7 @@ relink_command=\"$relink_command\"" # Not a directory, so check to see that there is only one file specified. set dummy $files - if test $# -gt 2; then + if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 exit 1 @@ -4151,7 +4193,7 @@ relink_command=\"$relink_command\"" $run eval "$striplib $destdir/$realname" || exit $? fi - if test $# -gt 0; then + if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. for linkname do @@ -4165,7 +4207,7 @@ relink_command=\"$relink_command\"" # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4284,7 +4326,11 @@ relink_command=\"$relink_command\"" if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` + if test $? = 0 ; then : + else + tmpdir="$tmpdir/libtool-$$" + fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 @@ -4352,7 +4398,7 @@ relink_command=\"$relink_command\"" # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4368,11 +4414,10 @@ relink_command=\"$relink_command\"" if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" - exec $SHELL $0 --finish$current_libdirs - exit 1 + exec_cmd='$SHELL $0 --finish$current_libdirs' + else + exit 0 fi - - exit 0 ;; # libtool finish mode @@ -4391,7 +4436,7 @@ relink_command=\"$relink_command\"" if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4410,7 +4455,7 @@ relink_command=\"$relink_command\"" fi # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 + test "$show" = : && exit 0 echo "----------------------------------------------------------------------" echo "Libraries have been installed in:" @@ -4575,11 +4620,8 @@ relink_command=\"$relink_command\"" LANG="$save_LANG"; export LANG fi - # Now actually exec the command. - eval "exec \$cmd$args" - - $echo "$modename: cannot exec \$cmd$args" - exit 1 + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" else # Display what would be done. if test -n "$shlibpath_var"; then @@ -4629,10 +4671,10 @@ relink_command=\"$relink_command\"" objdir="$dir/$objdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test $mode = uninstall && objdir="$dir" + test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates - if test $mode = clean; then + if test "$mode" = clean; then case " $rmdirs " in *" $objdir "*) ;; *) rmdirs="$rmdirs $objdir" ;; @@ -4641,14 +4683,14 @@ relink_command=\"$relink_command\"" # Don't error if the file doesn't exist and rm -f was used. if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ + || (test -h "$file") >/dev/null 2>&1 \ || test -f "$file"; then - : + : elif test -d "$file"; then - exit_status=1 + exit_status=1 continue elif test "$rmforce" = yes; then - continue + continue fi rmfiles="$file" @@ -4664,18 +4706,18 @@ relink_command=\"$relink_command\"" rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test $mode = uninstall; then + if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4685,12 +4727,12 @@ relink_command=\"$relink_command\"" if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then + if test "$?" -ne 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4702,15 +4744,29 @@ relink_command=\"$relink_command\"" ;; *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` - rmfiles="$rmfiles $dir/$oldobj" + # Possibly a libtool object, so verify it. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file + . $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" \ + && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" \ + && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi fi ;; *) # Do a test to see if this is a libtool program. - if test $mode = clean && + if test "$mode" = clean && (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file @@ -4744,11 +4800,18 @@ relink_command=\"$relink_command\"" ;; esac - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 + if test -z "$exec_cmd"; then + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 + exit 1 + fi fi # test -z "$show_help" +if test -n "$exec_cmd"; then + eval exec $exec_cmd + exit 1 +fi + # We need to display help for each of the modes. case $mode in "") $echo \ diff --git a/beecrypt/masm/Makefile.in b/beecrypt/masm/Makefile.in index 12c0068..5c6961e 100644 --- a/beecrypt/masm/Makefile.in +++ b/beecrypt/masm/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am's purpose is to add the Microsoft assembler files to the dist # @@ -32,7 +35,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -53,13 +55,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -68,11 +66,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,17 +83,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -104,109 +105,138 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnu no-dependencies EXTRA_DIST = blowfishopt.i586.asm fips180opt.i586.asm mp32opt.i386.asm +subdir = masm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.gnu.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - +CONFIG_HEADER = $(top_builddir)/config.gnu.h +CONFIG_CLEAN_FILES = +depcomp = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu masm/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu masm/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = masm +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic distclean-libtool -distclean-am: distclean-generic clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/beecrypt/mkinstalldirs b/beecrypt/mkinstalldirs index 6571451..a1e06b8 100755 --- a/beecrypt/mkinstalldirs +++ b/beecrypt/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# Id: mkinstalldirs,v 1.1 2001/03/21 10:50:16 bob Exp +# $Id: mkinstalldirs,v 1.2 2002/02/10 21:13:53 jbj Exp $ errstatus=0 diff --git a/beecrypt/mwerks/Makefile.in b/beecrypt/mwerks/Makefile.in index 3f654aa..2d84c8a 100644 --- a/beecrypt/mwerks/Makefile.in +++ b/beecrypt/mwerks/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am's purpose is to add the Metrowerks CodeWarrior assembler sources to the dist # @@ -32,7 +35,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -53,13 +55,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -68,11 +66,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,17 +83,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -104,109 +105,138 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnu no-dependencies EXTRA_DIST = beecrypt.pch blowfishopt.i586.asm fips180opt.i586.asm mp32opt.i386.asm +subdir = mwerks mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.gnu.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - +CONFIG_HEADER = $(top_builddir)/config.gnu.h +CONFIG_CLEAN_FILES = +depcomp = +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu mwerks/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu mwerks/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = mwerks +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic distclean-libtool -distclean-am: distclean-generic clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/beecrypt/tests/Makefile.in b/beecrypt/tests/Makefile.in index 97d7bf7..c884326 100644 --- a/beecrypt/tests/Makefile.in +++ b/beecrypt/tests/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ + # # Makefile.am's purpose is to build the beetest test program. # @@ -32,7 +35,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - SHELL = @SHELL@ srcdir = @srcdir@ @@ -53,13 +55,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -68,11 +66,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -85,17 +83,20 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ CPP = @CPP@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -104,6 +105,9 @@ STRIP = @STRIP@ VERSION = @VERSION@ ac_cv_have_java = @ac_cv_have_java@ ac_cv_have_javac = @ac_cv_have_javac@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnu no-dependencies @@ -116,80 +120,43 @@ beetest_SOURCES = beetest.c beetest_LDFLAGS = -all-static openpgp_SOURCES = openpgp.c +subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.gnu.h -CONFIG_CLEAN_FILES = +CONFIG_HEADER = $(top_builddir)/config.gnu.h +CONFIG_CLEAN_FILES = +EXTRA_PROGRAMS = beetest$(EXEEXT) openpgp$(EXEEXT) +am_beetest_OBJECTS = beetest.$(OBJEXT) +beetest_OBJECTS = $(am_beetest_OBJECTS) +beetest_LDADD = $(LDADD) +beetest_DEPENDENCIES = $(top_builddir)/libbeecrypt.la +am_openpgp_OBJECTS = openpgp.$(OBJEXT) +openpgp_OBJECTS = $(am_openpgp_OBJECTS) +openpgp_LDADD = $(LDADD) +openpgp_DEPENDENCIES = $(top_builddir)/libbeecrypt.la +openpgp_LDFLAGS = -DEFS = @DEFS@ -I. -I$(srcdir) -I.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -beetest_OBJECTS = beetest.$(OBJEXT) -beetest_LDADD = $(LDADD) -beetest_DEPENDENCIES = $(top_builddir)/libbeecrypt.la -openpgp_OBJECTS = openpgp.$(OBJEXT) -openpgp_LDADD = $(LDADD) -openpgp_DEPENDENCIES = $(top_builddir)/libbeecrypt.la -openpgp_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +depcomp = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(beetest_SOURCES) $(openpgp_SOURCES) +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(beetest_SOURCES) $(openpgp_SOURCES) -OBJECTS = $(beetest_OBJECTS) $(openpgp_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< -.S.o: - $(COMPILE) -c $< +all: all-am -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo @@ -198,130 +165,167 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -maintainer-clean-libtool: - -beetest$(EXEEXT): $(beetest_OBJECTS) $(beetest_DEPENDENCIES) + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +beetest$(EXEEXT): $(beetest_OBJECTS) $(beetest_DEPENDENCIES) @rm -f beetest$(EXEEXT) $(LINK) $(beetest_LDFLAGS) $(beetest_OBJECTS) $(beetest_LDADD) $(LIBS) - -openpgp$(EXEEXT): $(openpgp_OBJECTS) $(openpgp_DEPENDENCIES) +openpgp$(EXEEXT): $(openpgp_OBJECTS) $(openpgp_DEPENDENCIES) @rm -f openpgp$(EXEEXT) $(LINK) $(openpgp_LDFLAGS) $(openpgp_OBJECTS) $(openpgp_LDADD) $(LIBS) +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +.c.o: + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + +.c.obj: + $(COMPILE) -c `cygpath -w $<` + +.c.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +uninstall-info-am: + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(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; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = tests +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-compile mostlyclean-libtool \ - mostlyclean-tags mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am -clean-am: clean-compile clean-libtool clean-tags clean-generic \ - mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags -distclean-am: distclean-compile distclean-libtool distclean-tags \ - distclean-generic clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/configure.in b/configure.in index 878fba2..1d3a72c 100644 --- a/configure.in +++ b/configure.in @@ -6,16 +6,14 @@ dnl it, why check it? AC_INIT(rpmqv.c) AC_CANONICAL_SYSTEM - +AC_PREREQ(2.12) dnl Minimum Autoconf version required. AM_INIT_AUTOMAKE(rpm, 4.1) AM_CONFIG_HEADER(config.h) -AC_PREREQ(2.12) dnl Minimum Autoconf version required. - dnl XXX AM_MAINTAINER_MODE dnl Set of available languages. -ALL_LINGUAS="cs da de en_RN es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312" +ALL_LINGUAS="cs da de fi fr gl is ja ko no pl pt pt_BR ro ru sk sl sr sv tr" echo " @@ -25,8 +23,8 @@ echo " * * * This is source code from the development branch of rpm-4.1. * * * -* If you want the "production" rpm-4.0.3 code, then you should either use * -* an rpm-4.0.3 src.rpm, or, if using a CVS checkout, do the following: * +* If you want the "production" rpm-4.0.4 code, then you should either use * +* an rpm-4.0.4 src.rpm, or, if using a CVS checkout, do the following: * * * * cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel login * * (no password, just carriage return) * @@ -325,7 +323,7 @@ do fi AC_MSG_CHECKING(for $dir/include in INCPATH) - if test -d $dir/include ; then + if test -d $dir/include 2>/dev/null ; then if [ "$dir" != "/usr/local" ] ; then INCPATH="$INCPATH -I$dir/include" fi @@ -1185,13 +1183,13 @@ dnl XXX this causes popt to depend on zlib et al dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE -AC_CONFIG_SUBDIRS(popt beecrypt zlib $WITH_DB_SUBDIR) +AC_CONFIG_SUBDIRS(popt beecrypt zlib db3) AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/brp-redhat tools/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile - misc/Makefile po/Makefile.in intl/Makefile + misc/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/manual/Makefile doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile ], diff --git a/db3/.cvsignore b/db3/.cvsignore index c4f8fd1..f259e11 100644 --- a/db3/.cvsignore +++ b/db3/.cvsignore @@ -12,8 +12,6 @@ db_config.h libtool config.status include.tcl -db.h -db_int.h berkeley_db_svc db_archive db_checkpoint @@ -26,7 +24,10 @@ db_stat db_upgrade db_verify db3libobjs +db.h +db_cxx.h db_ext.h +db_int.h btree_ext.h clib_ext.h common_ext.h diff --git a/depcomp b/depcomp new file mode 100755 index 0000000..6589965 --- /dev/null +++ b/depcomp @@ -0,0 +1,411 @@ +#! /bin/sh + +# depcomp - compile a program generating dependencies as side-effects +# Copyright 1999, 2000 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. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi +# `libtool' can also be set to `yes' or `no'. + +depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. This file always lives in the current directory. + # Also, the AIX compiler puts `$object:' at the start of each line; + # $object doesn't have directory information. + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + + tmpdepfile1="$object.d" + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then + "$@" -Wc,-MD + else + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + else + tmpdepfile="$tmpdepfile2" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a space and a tab in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + test -z "$dashmflag" && dashmflag=-M + ( IFS=" " + case " $* " in + *" --mode=compile "*) # this is libtool, let us make it quiet + for arg + do # cycle over the arguments + case "$arg" in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + # X makedepend + ( + shift + cleared=no + for arg in "$@"; do + case $cleared in no) + set ""; shift + cleared=yes + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift;; + -*) + ;; + *) + set fnord "$@" "$arg"; shift;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tail +3 "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 diff --git a/install-sh b/install-sh index 5871924..e9de238 100755 --- a/install-sh +++ b/install-sh @@ -1,15 +1,27 @@ -#! /bin/sh +#!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5. +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script @@ -106,6 +118,7 @@ if [ x"$dir_arg" != x ]; then if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi diff --git a/intl/ChangeLog b/intl/ChangeLog index df904de..84e2b37 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,4 +1,4 @@ -2001-05-23 GNU +2001-09-13 GNU - * Version 0.10.38 released. + * Version 0.10.40 released. diff --git a/intl/Makefile.in b/intl/Makefile.in index 889ba23..19ed4a7 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -1,19 +1,20 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. # Copyright (C) 1995-1998, 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) +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # -# You should have received a copy of the GNU 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. +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \ config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc +DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c # Libtool's library version information for libintl. @@ -184,7 +185,7 @@ install-data: all $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="$(DISTFILES.common)"; \ + dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ for file in $$dists; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -243,7 +244,7 @@ uninstall: : ; \ fi if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \ + for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ diff --git a/intl/VERSION b/intl/VERSION index 268da64..cb8a01a 100644 --- a/intl/VERSION +++ b/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.38 +GNU gettext library from gettext-0.10.40 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 7e5a74a..c6a9bd1 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -1,19 +1,20 @@ /* Implementation of the bindtextdomain(3) function Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/config.charset b/intl/config.charset index d6f3695..f4f2611 100755 --- a/intl/config.charset +++ b/intl/config.charset @@ -80,10 +80,10 @@ # EUC-KR glibc aix hpux irix osf solaris freebsd yes # EUC-TW glibc aix hpux irix osf solaris # BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5HKSCS glibc +# BIG5-HKSCS glibc # GBK aix osf win32 dos # GB18030 glibc -# SJIS hpux osf solaris freebsd +# SHIFT_JIS hpux osf solaris freebsd yes # JOHAB glibc win32 # TIS-620 glibc aix hpux osf solaris # VISCII glibc yes @@ -174,7 +174,7 @@ case "$os" in echo "eucTW EUC-TW" echo "hp15CN GB2312" #echo "ccdc ?" # what is this? - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "utf8 UTF-8" ;; irix*) @@ -209,7 +209,7 @@ case "$os" in echo "GBK GBK" echo "KSC5601 CP949" echo "sdeckanji EUC-JP" - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "TACTIS TIS-620" echo "UTF-8 UTF-8" ;; @@ -230,7 +230,7 @@ case "$os" in echo "cns11643 EUC-TW" echo "5601 EUC-KR" echo "eucJP EUC-JP" - echo "PCK SJIS" + echo "PCK SHIFT_JIS" echo "TIS620.2533 TIS-620" #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" @@ -266,8 +266,8 @@ case "$os" in echo "zh_TW.Big5 BIG5" echo "zh_CN.EUC GB2312" echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SJIS" - echo "ja_JP.Shift_JIS SJIS" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ja_JP.Shift_JIS SHIFT_JIS" echo "ko_KR.EUC EUC-KR" ;; beos*) diff --git a/intl/dcgettext.c b/intl/dcgettext.c index 469e78d..b7c9652 100644 --- a/intl/dcgettext.c +++ b/intl/dcgettext.c @@ -1,19 +1,20 @@ /* Implementation of the dcgettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 8456550..6acde19 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -1,19 +1,20 @@ /* Implementation of the internal dcigettext function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include @@ -517,6 +518,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) /* We cannot get the current working directory. Don't signal an error but simply return the default string. */ FREE_BLOCKS (block_list); + __libc_rwlock_unlock (_nl_state_lock); __set_errno (saved_errno); return (plural == 0 ? (char *) msgid1 diff --git a/intl/dcngettext.c b/intl/dcngettext.c index e5da257..c16af21 100644 --- a/intl/dcngettext.c +++ b/intl/dcngettext.c @@ -1,19 +1,20 @@ /* Implementation of the dcngettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/dgettext.c b/intl/dgettext.c index c513041..3651207 100644 --- a/intl/dgettext.c +++ b/intl/dgettext.c @@ -1,19 +1,20 @@ /* Implementation of the dgettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/dngettext.c b/intl/dngettext.c index 79aaa9a..f214e95 100644 --- a/intl/dngettext.c +++ b/intl/dngettext.c @@ -1,19 +1,20 @@ /* Implementation of the dngettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/explodename.c b/intl/explodename.c index c4ddcc4..2985064 100644 --- a/intl/explodename.c +++ b/intl/explodename.c @@ -1,19 +1,20 @@ /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/finddomain.c b/intl/finddomain.c index 4882554..2f103d5 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -2,19 +2,20 @@ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/gettext.c b/intl/gettext.c index a640205..22a6c24 100644 --- a/intl/gettext.c +++ b/intl/gettext.c @@ -1,19 +1,20 @@ /* Implementation of gettext(3) function. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/gettext.h b/intl/gettext.h index eb58890..6f5d760 100644 --- a/intl/gettext.h +++ b/intl/gettext.h @@ -1,19 +1,20 @@ /* Description of GNU message catalog format: general file layout. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _GETTEXT_H #define _GETTEXT_H 1 diff --git a/intl/gettextP.h b/intl/gettextP.h index ee8ca48..43de1cd 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -2,19 +2,20 @@ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _GETTEXTP_H #define _GETTEXTP_H diff --git a/intl/hash-string.h b/intl/hash-string.h index 37d4ce1..ccb7acc 100644 --- a/intl/hash-string.h +++ b/intl/hash-string.h @@ -1,19 +1,20 @@ /* Description of GNU message catalog format: string hashing function. Copyright (C) 1995, 1997, 1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* @@ end of prolog @@ */ diff --git a/intl/intl-compat.c b/intl/intl-compat.c index b8edaa1..0a06ce9 100644 --- a/intl/intl-compat.c +++ b/intl/intl-compat.c @@ -2,19 +2,20 @@ Library. Copyright (C) 1995, 2000, 2001 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. */ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 557253e..533e94b 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -1,19 +1,20 @@ /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for stpcpy(). This must come before because may include diff --git a/intl/libgettext.h b/intl/libgettext.h index 553382c..c5be54a 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -1,19 +1,20 @@ /* Convenience header for conditional use of GNU . Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h index 577001a..f891deb 100644 --- a/intl/libgnuintl.h +++ b/intl/libgnuintl.h @@ -1,19 +1,20 @@ /* Message catalogs for internationalization. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LIBINTL_H #define _LIBINTL_H 1 diff --git a/intl/loadinfo.h b/intl/loadinfo.h index 5171a8f..b861260 100644 --- a/intl/loadinfo.h +++ b/intl/loadinfo.h @@ -2,19 +2,20 @@ This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LOADINFO_H #define _LOADINFO_H 1 diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index d589243..f99ebee 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -1,19 +1,20 @@ /* Load needed message catalogs. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include diff --git a/intl/localcharset.c b/intl/localcharset.c index 22e09e4..61f8f3e 100644 --- a/intl/localcharset.c +++ b/intl/localcharset.c @@ -75,13 +75,13 @@ /* Pointer to the contents of the charset.alias file, if it has already been read, else NULL. Its format is: ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static char * volatile charset_aliases; +static const char * volatile charset_aliases; /* Return a pointer to the contents of the charset.alias file. */ static const char * get_charset_aliases () { - char *cp; + const char *cp; cp = charset_aliases; if (cp == NULL) diff --git a/intl/locale.alias b/intl/locale.alias index 48940f7..bd7b9b3 100644 --- a/intl/locale.alias +++ b/intl/locale.alias @@ -1,19 +1,20 @@ # Locale name alias data base. # Copyright (C) 1996,1997,1998,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) +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # -# You should have received a copy of the GNU 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. +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. # The format of this file is the same as for the corresponding file of # the X Window System, which normally can be found in @@ -46,7 +47,7 @@ galego gl_ES.ISO-8859-1 galician gl_ES.ISO-8859-1 german de_DE.ISO-8859-1 greek el_GR.ISO-8859-7 -hebrew iw_IL.ISO-8859-8 +hebrew he_IL.ISO-8859-8 hrvatski hr_HR.ISO-8859-2 hungarian hu_HU.ISO-8859-2 icelandic is_IS.ISO-8859-1 diff --git a/intl/localealias.c b/intl/localealias.c index 76f19a9..91e7acc 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -1,19 +1,20 @@ /* Handle aliases for locale names. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include diff --git a/intl/ngettext.c b/intl/ngettext.c index 8b1fa02..fb3ec5a 100644 --- a/intl/ngettext.c +++ b/intl/ngettext.c @@ -1,19 +1,20 @@ /* Implementation of ngettext(3) function. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/intl/plural.c b/intl/plural.c index 8191335..640d43c 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -23,19 +23,20 @@ Copyright (C) 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* The bison generated parser uses alloca. AIX 3 forces us to put this declaration at the beginning of the file. The declaration in bison's @@ -66,13 +67,13 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 52 "plural.y" +#line 53 "plural.y" typedef union { unsigned long int num; enum operator op; struct expression *exp; } YYSTYPE; -#line 58 "plural.y" +#line 59 "plural.y" /* Prototypes for local functions. */ static struct expression *new_exp PARAMS ((int nargs, enum operator op, @@ -234,8 +235,8 @@ static const short yyrhs[] = { 17, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 177, 185, 189, 193, 197, 201, 205, 209, 213, 217, - 221, 226 + 178, 186, 190, 194, 198, 202, 206, 210, 214, 218, + 222, 227 }; #endif @@ -845,7 +846,7 @@ yyreduce: switch (yyn) { case 1: -#line 178 "plural.y" +#line 179 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; @@ -853,68 +854,68 @@ case 1: ; break;} case 2: -#line 186 "plural.y" +#line 187 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 3: -#line 190 "plural.y" +#line 191 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 4: -#line 194 "plural.y" +#line 195 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 5: -#line 198 "plural.y" +#line 199 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 6: -#line 202 "plural.y" +#line 203 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 7: -#line 206 "plural.y" +#line 207 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 8: -#line 210 "plural.y" +#line 211 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 9: -#line 214 "plural.y" +#line 215 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); ; break;} case 10: -#line 218 "plural.y" +#line 219 "plural.y" { yyval.exp = new_exp_0 (var); ; break;} case 11: -#line 222 "plural.y" +#line 223 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; ; break;} case 12: -#line 227 "plural.y" +#line 228 "plural.y" { yyval.exp = yyvsp[-1].exp; ; @@ -1141,7 +1142,7 @@ yyerrhandle: } return 1; } -#line 232 "plural.y" +#line 233 "plural.y" void diff --git a/intl/plural.y b/intl/plural.y index 42ffa0e..be049a6 100644 --- a/intl/plural.y +++ b/intl/plural.y @@ -3,19 +3,20 @@ Copyright (C) 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* The bison generated parser uses alloca. AIX 3 forces us to put this declaration at the beginning of the file. The declaration in bison's diff --git a/intl/textdomain.c b/intl/textdomain.c index 05c2fd7..2e420ad 100644 --- a/intl/textdomain.c +++ b/intl/textdomain.c @@ -1,19 +1,20 @@ /* Implementation of the textdomain(3) function. Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/macros.in b/macros.in index 7ccc1eb..4a50659 100644 --- a/macros.in +++ b/macros.in @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.95 2002/02/04 23:29:59 jbj Exp $ +# $Id: macros.in,v 1.96 2002/02/10 21:13:52 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -754,7 +754,7 @@ %_build_vendor %{_host_vendor} %_build_os %{_host_os} %_host @host@ -%_host_alias @host_alias@ +%_host_alias @host_alias@%{nil} %_host_cpu @host_cpu@ %_host_vendor @host_vendor@ %_host_os @host_os@ diff --git a/missing b/missing index cbe2b0e..0a7fb5a 100755 --- a/missing +++ b/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. +# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,37 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +70,15 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing 0.3 - GNU automake" ;; -*) @@ -61,7 +90,7 @@ Supported PROGRAM values: aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -70,7 +99,7 @@ WARNING: \`$1' is missing on your system. You should only need it if autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -79,29 +108,31 @@ WARNING: \`$1' is missing on your system. You should only need it if autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in` - if test -z "$files"; then - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in` - test -z "$files" || files="$files.in" - else - files=`echo "$files" | sed -e 's/:/ /g'` - fi - test -z "$files" && files="config.h.in" - touch $files + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files ;; automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print \ - | sed 's/^\(.*\).am$/touch \1.in/' \ - | sh + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done ;; bison|yacc) @@ -157,7 +188,32 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -173,6 +229,45 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff --git a/mkinstalldirs b/mkinstalldirs index cc9e23c..167d07b 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 1998/07/17 14:18:48 jbj Exp $ +# $Id: mkinstalldirs,v 1.2 2002/02/10 21:13:52 jbj Exp $ errstatus=0 @@ -22,7 +22,7 @@ do esac if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 + echo "mkdir $pathcomp" mkdir "$pathcomp" || lasterr=$? diff --git a/po/ChangeLog b/po/ChangeLog new file mode 100644 index 0000000..bc697cb --- /dev/null +++ b/po/ChangeLog @@ -0,0 +1,6 @@ +2002-02-10 gettextize + + * Makefile.in.in: Upgrade to gettext-0.10.40. + * cat-id-tbl.c: Remove file. + * stamp-cat-id: Remove file. + diff --git a/po/Makefile.in.in b/po/Makefile.in.in index cb5a26f..32b7376 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper # # This file file be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License @@ -9,6 +9,10 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + SHELL = /bin/sh @SET_MAKE@ @@ -18,22 +22,20 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/gettext/po -subdir = po +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = PATH=../intl:$$PATH @GMSGFMT@ +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../intl:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../intl:$$PATH msgmerge +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -43,20 +45,17 @@ INCLUDES = -I.. -I$(top_srcdir)/intl COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \ -stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ +$(POFILES) $(GMOFILES) POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .c.o: $(COMPILE) $< @@ -70,98 +69,55 @@ INSTOBJEXT = @INSTOBJEXT@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< all: all-@USE_NLS@ -all-yes: cat-id-tbl.c $(CATALOGS) +all-yes: $(CATALOGS) all-no: -$(srcdir)/$(PACKAGE).pot: $(POTFILES) +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ --keyword=RPM_ \ + --add-comments --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(PACKAGE).po \ || ( rm -f $(srcdir)/$(PACKAGE).pot \ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: -$(srcdir)/stamp-cat-id: $(PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ - | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -x "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + : ; \ fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ - *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ fi; \ done - if test "$(PACKAGE)" = "gettext"; then \ - if test -x "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi # Define this as empty until I found a useful application. installcheck: @@ -170,88 +126,68 @@ uninstall: catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done + if test "$(PACKAGE)" = "gettext"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi check: all -cat-id-tbl.o: ../intl/libgettext.h - dvi info tags TAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f $(GMOFILES) -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) dists="$(DISTFILES)"; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done update-po: Makefile $(MAKE) $(PACKAGE).pot - PATH=`pwd`/../intl:$$PATH; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ + catalogs='$(GMOFILES)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - mv $$lang.po $$lang.old.po; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ - rm -f $$lang.old.po; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ else \ echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ - mv $$lang.old.po $$lang.po; \ + rm -f $$lang.new.po; \ fi; \ done + $(MAKE) update-gmo -refresh-po: Makefile - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot > $$lang.pot ; then \ - echo "$(MSGMERGE) of $$lang succeeded" ; \ - mv -f $$lang.pot $$lang.po ; \ - else \ - echo "$(MSGMERGE) of $$lang failed" ; \ - rm -f $$lang.pot ; \ - fi \ - done +update-gmo: Makefile $(GMOFILES) + @: -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) - -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ +Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status diff --git a/po/cs.po b/po/cs.po index dd90dca..d00a97a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -73,253 +73,253 @@ msgstr "chyba p msgid "cannot re-open payload: %s\n" msgstr "nemohu znovu otevøít payload: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "vypsat pou¾ívanou verzi rpm" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "poskytnout výstu s ménì detaily" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "poskytnout detailnìj¹í výstup" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "definování makra s obsahem " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "vypsat expanzi makra +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "odeslat stdout do " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "pou¾ít jako adresáø nejvy¹¹í úrovnì" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "èíst místo implicitního makro souboru" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "èíst místo implicitního rpmrc souboru" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "zobrazit finální konfiguraci rpmrc a maker" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "zakázat pou¾ití libio(3) API" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "ladit protokol datového toku" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "ladit rpmio I/O" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "ladit manipulaci s URL cache" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "Volby dotazù (s -q or --query):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "Vollby kontroly (s -V or --verify):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "Volby signatury:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "Volby databáze:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" "Sestavovací volby s [ | | ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "Volby pro Instalaci/Aktualizaci/Mazání:" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "Spoleèné volby pro v¹echny módy:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM verze %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (c) 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL." -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Pou¾ití: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "Volba --rcfile byla odstranìna.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Pou¾ijte volbu \"--macros \".\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "specifikovat lze jen jeden hlavní re¾im" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "najednou lze provést jen jeden typ dotazu èi ovìøení" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "neoèekávaný pøíznak pro dotaz" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "neoèekávaný formát dotazu" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "neoèekávaný zdroj dotazu" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "vynucena mù¾e být jen instalace, aktualizace, smazání zdrojových kódù a spec " "souboru" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "soubory mohou být pøemístìny jen pøi instalaci balíèkù" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate a --excludepath je mo¾no pou¾ít jen pøi instalaci nových balíèkù" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix je mo¾no pou¾ít jen pøi instalaci nových balíèkù" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "parametry pro --prefix musejí zaèínat znakem /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles mù¾e být pou¾it jen pøi instalaci balíèkù" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb mù¾e být pou¾it jen pøi instalaci a odstraòování balíèkù" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" @@ -327,7 +327,7 @@ msgstr "" "volba pro potlaèení skriptù mù¾e být pou¾ita jen pøi instalaci nebo pøi " "odstraòování balíèkù" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" @@ -335,7 +335,7 @@ msgstr "" "volba pro potlaèení triggerù mù¾e být pou¾ita jen pøi instalaci nebo " "odstraòování balíèkù" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -343,13 +343,13 @@ msgstr "" "--nodeps mù¾e být pou¾it jen pøi sestavování, rekompilaci, instalaci, " "odstraòování a kontrole" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "--test mù¾e být pou¾it jen pøi instalaci, odstraòování a sestavování" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -357,82 +357,82 @@ msgstr "" "--root (-r) mù¾e být pou¾it jen pøi instalaci, odstraòování, dotazech nebo " "znovuvytvoøení databáze" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "parametry pro --root (-r) musejí zaèínat znakem /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "¾ádné soubory k podepsání\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "pøístup k souboru %s se nezdaøil\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp nenalezeno: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Vlo¾te heslovou frázi: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Chybná heslová fráze\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Heslová fráze je v poøádku.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "©patná %%_signature spec v souboru maker.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "spu¹tìní selhalo\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ke znovusestavení nezadány ¾ádné balíèky" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "pro sestavení nezadány ¾ádné spec soubory" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "pro sestavení nezadány ¾ádné tar soubory" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "k podepsání nezadány ¾ádné balíèky" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "nezadány ¾ádné balíèky pro instalaci" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "k dotazu nezadány ¾ádné parametry" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "pro kontrolu nezadány ¾ádné balíèky" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "neoèekávané parametry pro --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "k dotazu nezadány ¾ádné parametry" @@ -831,7 +831,7 @@ msgstr "Nemohu p msgid "Could not open %s: %s\n" msgstr "Nemohu otevøít %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Nemohu zapsat balíèek: %s\n" @@ -861,7 +861,7 @@ msgstr "Nemohu p msgid "Unable to write payload to %s: %s\n" msgstr "Nemohu zapsat payload do %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapsáno: %s\n" @@ -1484,23 +1484,23 @@ msgstr "NE " msgid "YES" msgstr "ANO" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== ukládání tsort relací\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1508,26 +1508,26 @@ msgid "" msgstr "" "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "SMYÈKA:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== pokraèuje tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(není èíslo)" @@ -1580,37 +1580,37 @@ msgstr "========= Adres msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "vytvoøen adresáø %s s právy %04o.\n" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s ulo¾eno jako %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s odstranìní %s selhalo: Adresáø není prázdný\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s selhal: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink %s selhal: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s vytvoøen jako %s\n" @@ -1874,191 +1874,211 @@ msgstr "neinstalovat ale sd msgid "upgrade package(s)" msgstr "aktualizace balíèku" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "dotázat/ovìøit v¹echny balíèky" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im kontroly" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "dotaz/ovìøení balíèkù ve skupinì" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "dotaz/ovìøení souboru s balíèkem (tj. binárního RPM souboru)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "dotaz/ovìøení balíèkù vlastnícího soubor" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "re¾im dotazù" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "zobrazit známé znaèky pro dotazy" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "dotaz na spec soubor" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "dotaz/ovìøení balíèkù ve skupinì" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "dotaz na balíèky aktivované balíèkem" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "re¾im kontroly" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "re¾im kontroly (zastaralý)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "dotaz/ovìøení balíèkù vy¾adujících závislost" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "dotaz/ovìøení balíèkù poskytujících závislost" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "vypsat v¹echny konfiguraèní soubory" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "vypsat v¹echny soubory s dokumentací" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "zobrazit základní informace o souborech" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "vypsat soubory v balíèku" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "vynechat %%ghost soubory" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "vynechat %%license soubory" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "vynechat %%readme soubory" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "pou¾ij následující formát dotazù" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "nahradit i18n sekce do spec souboru" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "zobrazit stav vypsaných souborù" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "zobrazit roz¹íøený výpis souborù" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "nekontrolovat velikost souborù" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "nekontrolovat cesty symbolických linek" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "nekontrolovat vlastníka souborù" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "nekontrolovat skupinu souborù" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "nekontrolovat èas zmìny souboru" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "nekontrolovat mód souborù" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "nekontrolovat soubory v balíèku" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "nekontrolovat závislosti balíèkù" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "nespou¹tìt %verifyscript (pokud existuje)" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "nekontrolovat cesty symbolických linek" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "nekontrolovat SHA1 digest v hlavièce" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "nekontrolovat MD5 souborù v balíèku" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "podepsat balíèek (zahodit aktuální podpis)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "ovìøit podpis v balíèku" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "podepsat balíèek (zahodit aktuální podpis)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "generovat PGP/GPG podpis" @@ -2143,7 +2163,7 @@ msgid "is needed by" msgstr " je nutné pro %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datový typ %d není podporován\n" @@ -2191,31 +2211,31 @@ msgstr "%s: %s-%s-%s obsahuje %d soubor msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ita skupina root\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " na souboru " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nemohu otevøít %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s selhalo\n" @@ -2263,81 +2283,91 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "nemohu provést dotaz %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "otevøení %s selhalo: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "dotaz na %s se nezdaøil\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread selhalo: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "¾ádné balíèky\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾ádné balíèky\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "¾ádný balíèek neaktivuje %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Nemohu èíst %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "¾ádný balíèek neaktivuje %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "¾ádný balíèek nevy¾aduje %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "¾ádný balíèek neposkytuje %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "soubor %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "soubor %s nevlastní ¾ádný balíèek\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "neplatné èíslo balíèku: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "záznam balíèku èíslo: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "záznam %d nelze pøeèíst\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2936,82 +2966,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "Poèet dataLength() RPM_STRING_TYPE musí být 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "chybí { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "po %{ chybí }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "prázdný formát znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "prázdné jméno znaèky" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "neznámá znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "na konci pole oèekáváno ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "neoèekávaná ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "neoèekávaná }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "ve výrazu oèekáván ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "ve výrazu je po ? oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "ve výrazu je oèekávána }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "v podvýrazu je po ? oèekávána :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "ve výrazu je po : oèekávána {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "na konci výrazu je oèekáváno |" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(neznámý typ)" @@ -3079,7 +3109,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "chyba(%d) pøi poèítání balíèkù\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databázi je chybný -- vynechávám.\n" @@ -3094,243 +3124,243 @@ msgstr "rpmdb: poru msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuji \"%s\" z indexu %s.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuji %d polo¾ek z indexu %s.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba(%d) pøi alokaci nové instance balíèku\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "pøidávám \"%s\" do indexu %s\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "pøidávám %d polo¾ek do indexu %s.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "nebyla nastavena dbpath" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "databázi %s pøevádím do %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáze %s ji¾ existuje\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "vytváøím adresáø %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "vytváøím adresáø %s: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "otevírám starou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "otevírám novou databázi s dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu pøidat záznam - pùvodnì u %d\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "starou databázi nelze nahradit novou databází!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "pro obnovení nahraïte soubory v %s soubory z %s" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "ma¾u adresáø %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nemohu odstranit adresáø %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktivní %d prázdný %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdný)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdný)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s má neukonèené tìlo\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s má neplatné jméno (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s má neukonèené parametry\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s má prázdné tìlo\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Expanze makra %%%s selhala\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s má neplatné jméno (%%undefine)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nebylo pou¾ito pod úrovní %d\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznámá volba: %c v %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Hloubka rekurze(%d) je vìt¹í, ne¾ max(%d)\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "Neukonèené %c: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Za %% následuje neparsovatelné makro\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "makro %%%.*s nenalezeno, pøeskakuji\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Cílový buffer pøetekl\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Soubor %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Soubor %s je men¹í, ne¾ %d bajtù\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Úspìch" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Chybná odezva FTP serveru" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "I/O chyba serveru" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Timeout serveru" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Nelze pøevést jméno na IP adresu poèítaèe" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Nelze pøevést IP na jméno poèítaèe" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Pøipojení k serveru selhalo" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Selhalo navázání datového spojení se serverem" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "I/O chyba pøi lokálním souboru" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Chyba pøi nastavení vzdáleného serveru do pasivního re¾imu" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Soubor nebyl na serveru nalezen" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Probíhá pøeru¹ení" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Neznámá nebo neoèekávaná chyba" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "pøihla¹ování na %s jako %s, heslo %s\n" diff --git a/po/da.po b/po/da.po index 9d4707d..04ec310 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -74,263 +74,263 @@ msgstr "fejl ved l msgid "cannot re-open payload: %s\n" msgstr "kan ikke genåbne pakkeindhold: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "vis versionen af rpm som benyttes" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "medtag mindre detaljerede oplysninger" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "medtag mere detaljerede oplysninger" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "definér makro med værdi " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "udlæs makroudvidelse af +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "send standard-ud til " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "brug som topniveau-katalog" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "læs i stedet for standard makrofil(er)" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "læs i stedet for standard rpmrc-fil(er)" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "vis den endelige rpmrc og makrokonfiguration" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "undlad at benytte libio(3)-API" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "aflus protokol-datastrøm" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "aflus rpmio I/O" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "aflus URL-bufferhåndtering" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "Forespørgselstilvalg (med -q eller --query):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "Verifikationstilvalg (med -V eller --verify):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "Signaturtilvalg" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "Databasetilvalg:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "Opbygningstilvalg med [ | | ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "Fælles tilvalg for alle rpm-tilstande:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "fil %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Brug: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "Tilvalget --rcfile er fjernet.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Brug \"--macros \" i stedet..\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "kun ét hovedtilvalg kan angives" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "kun én af forespørgsel/verificér kan udføres ad gangen" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "uventet forespørgselsflag" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "uventet forespørgselsformat" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "uventet forespørgselskilde" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath angivet ved en operation, der ikke benytter en database" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "filer kan kun omrokeres under installation" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "kun én af --prefix eller --relocate kan bruges" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--relocate og --excludepath kan kun bruges, når nye pakker installeres" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix kan kun bruges, når nye pakker installeres" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "parametre til --prefix skal starte med et /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) kan kun angives ved installation" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent kan kun angives ved installation" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles kan kun angives ved installation" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs kan kun angives ved installation" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs kan kun angives ved installation" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs kan kun angives ved installation" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "kun én af --excludedocs og --includedocs kan angives" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch kan kun angives ved installation" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos kan kun angives ved installation" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize kan kun angives ved installation" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches kan kun angives ved installation" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles kan kun angives ved installation" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb kan kun angives ved installation og sletning" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb kan kun angives ved installation og sletning" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--notriggers kan kun angives ved installation og sletning af pakker" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -338,13 +338,13 @@ msgstr "" "--nodeps kan kun angives ved opbygning, genopbygning, genoversættelse, " "installation, sletning og verifikation" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "--test kan kun angives ved installation, sletning og opbygning" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -352,82 +352,82 @@ msgstr "" "--root (-r) kan kun angives ved installation, sletning, forespørgsel og " "genopbygning af databasen" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "parameteren til --root (-r) skal starte med et /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "ingen filer at underskrive\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "kan ikke tilgå filen %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp ikke fundet: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Indtast adgangskode: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Adgangskode ikke godkendt\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Adgangskode godkendt.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Ugyldig angivelse af %%_signature i makrofil.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign kan kun bruges ved pakkeopbygning" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "eksekvering mislykkedes\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler angivet til genopbygning" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "ingen spec-fil angivet til opbygning" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "ingen tar-arkiver angivet til opbygning" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "ingen pakker angivet ved signering" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "ingen pakker angivet ved installation" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "ingen parametre angivet ved forespørgsel" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "ingen parametre angivet ved verifikation" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "uventede parametre til --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "ingen parametre angivet ved forespørgsel" @@ -828,7 +828,7 @@ msgstr "Kunne ikke l msgid "Could not open %s: %s\n" msgstr "Kunne ikke åbne %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -858,7 +858,7 @@ msgstr "Kunne ikke l msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1486,48 +1486,48 @@ msgstr "IKKE O.K." msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== gemmer tsort-relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "LØKKE:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== fortsætter tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(ikke et tal)" @@ -1579,37 +1579,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linie %d: %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kan ikke fjerne %s - katalog ikke tomt\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "fjernelse (rmdir) af %s mislykkedes: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" @@ -1881,198 +1881,218 @@ msgstr "install msgid "upgrade package(s)" msgstr "opgradér pakke" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "forespørg/verificér alle pakker" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "rpm verifikationstilstand" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "forespørg/verificér pakke(r), der ejer filen" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "forespørg/verificér pakke(r), der ejer filen" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "forespørg/verificér pakke(r) i gruppen" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "forespørg/verificér pakke(r), der ejer filen" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "forespørg/verificér en pakkefil (dvs. en binær *.rpm-fil)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "forespørg/verificér pakke(r), der ejer filen" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "rpm forespørgselstilstand" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "vis kendte forespørgselsmærker" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "forespørg en spec-fil" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "forespørg/verificér pakke(r) i gruppen" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "forespørg pakke(r), der udløses af pakken" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "rpm verifikationstilstand" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "gammel rpm verifikationstilstand" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "forespørg/verificér pakke(r), der stiller et krav" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "forespørg/verificér pakke(r), der tilfredsstiller et krav" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "vis alle konfigurationsfiler" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "vis alle dokumentationsfiler" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "vis grundlæggende filinformation" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "vis liste over filerne i pakken" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead mislykkedes\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "brug følgende forespørgselsformat" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "erstat i18n-sektioner i spec-fil" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "vis filernes status" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "giv en detaljeret filliste" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "undlad at tjekke pakkers afhængighedskrav" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "udfør ikke eventuelt %verifyscript" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "verificér ikke filerne i pakke" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "underskriv en pakke (slet nuværende signatur)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "verificér pakkesignatur" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "underskriv en pakke (slet nuværende signatur)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "generér PGP/GPG-signatur" @@ -2159,7 +2179,7 @@ msgid "is needed by" msgstr " kræves af %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d understøttes ikke\n" @@ -2209,31 +2229,31 @@ msgstr "pakke: %s-%s-%s filer test = %d\n" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "bruger %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "gruppe %s eksisterer ikke - bruger root\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " for fil " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "kunne ikke åbne %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s mislykkedes\n" @@ -2281,81 +2301,91 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kunne ikke forespørge %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "åbning af %s mislykkedes %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "forespørgsel af %s mislykkedes\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "pakke med gammelt kildeformat kan ikke forespørges\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: læs manifest mislykkedes: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "ingen pakker\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s indeholder ingen pakker\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakker udløser %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Kunne ikke læse %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "ingen pakker udløser %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "ingen pakker kræver %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "ingen pakker tilfører %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tilhører ingen pakke\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldigt pakkenummer: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "pakkens post-nummer: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "post %d kunne ikke læses\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "pakken %s er ikke installeret\n" @@ -2956,82 +2986,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "manglende { efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "manglende } efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "tomt mærkeformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "tomt mærkenavn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "ukendt mærke" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] forventet ved slutningen af tabel" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "uventet ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "uventet }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "? forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "{ forventet efter ? i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "} forventet i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr ": forventet efter ?-underudtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "{ forventet efter : i udtryk" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "| forventet ved slutningen af udtryk" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(ukendt type)" @@ -3102,7 +3132,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "fejl(%d) ved optælling af pakker\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n" @@ -3117,246 +3147,246 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "fjerner \"%s\" fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "fjerne %d indgange fra %s-indekset.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fejl(%d) under allokering af ny pakkeinstans\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" "tilføjer \"%s\" til '%s'-indekset.\n" "\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "tilføjer %d indgange til '%s'-indekset.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "fjerner %s efter vellykket genopbygning af db3.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "genopbygger database %s over i %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "den midlertidige database %s eksisterer allerede\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" "opretter kataloget %s\n" "\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "opretter kataloget %s: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "åbner gammel database med dbapi %d\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "åbner ny database med dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "fjerner kataloget %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktiv %d tom %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makroen %%%s har et uafsluttet indhold (body)\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makroen %%%s har et ugyldig navn (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makroen %%%s har uafsluttede parametre\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "Makroen %%%s har intet indhold\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makroen %%%s kunne ikke udfoldes\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makroen %%%s har ugyldigt navn (%%undefine)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) blev ikke brugt under niveau %d\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Ukendt tilvalg %c i %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdybde(%d) overskrider maks(%d)\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "Uafsluttet %c: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makroen %%%.*s blev ikke fundet, overspringer\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Overløb i målbuffer\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s er mindre end %u byte\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Succes" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Ugyldigt svar fra server" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "I/O-fejl for server" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Tidsudløb for server" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Kunne ikke skaffe serverens IP-addresse" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Kunne ikke slå serverens navn op" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Kunne ikke etablere en forbindelse til serveren" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Kunne ikke etablere en data-forbindelse til serveren" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "I/O-fejl i lokal fil" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Kunne ikke sætte fjernserveren i passiv tilstand" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Fil ikke fundet på server" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Afbryder programmet" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Ukendt eller uventet fejl" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logger på %s som %s, adgangskode %s\n" diff --git a/po/de.po b/po/de.po index 9edc4b1..654aba5 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -116,265 +116,265 @@ msgstr "Fehler beim Suchen nach Paket %s\n" msgid "cannot re-open payload: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "Die benutzte RPM-Version anzeigen" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "Die benutzte RPM-Version anzeigen" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "Standard-Ausgabe nach umleiten" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr " als Stammverzeichnis benutzen" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" # , c-format #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM Version %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 #, fuzzy msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright © 1998 - Red Hat Software" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "Benutzung: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Benutzen Sie stattdessen -e oder --erase\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "Es darf nur ein Hauptmodus angegeben werden" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" "Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt " "werden" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "Unerwartete Quelle der Anfrage" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "Unerwartete Quelle der Anfrage" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "Unerwartete Quelle der Anfrage" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "nur die Installation und Aktualisierung darf erzwungen werden" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "Dateien können nur während der Paketinstallation verschoben werden" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "Argumente zu --prefix müssen mit einem / beginnen" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles darf nur während der Paketinstallation angegeben werden" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" "--justdb kann nur während der Paketinstallation und -deinstallation " "angegeben werden" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " @@ -383,7 +383,7 @@ msgstr "" "--justdb kann nur während der Paketinstallation und -deinstallation " "angegeben werden" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " @@ -392,7 +392,7 @@ msgstr "" "--justdb kann nur während der Paketinstallation und -deinstallation " "angegeben werden" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -401,7 +401,7 @@ msgstr "" "--nodeps darf nur während der Paketinstallation, -deinstallation und -" "überprüfung angegeben werden" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" @@ -409,7 +409,7 @@ msgstr "" "--test darf nur während der Paketinstallation, -deinstallation und -" "erstellung angegeben werden" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -417,84 +417,84 @@ msgstr "" "--root (-r) darf nur während der Paketinstallation, -deinstallation, -" "anfrage und Datenbankneuerstellungen angegeben werden" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "Argumente zu --root (-r) müssen mit einem / beginnen" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, fuzzy, c-format msgid "cannot access file %s\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "Datei auf dem Server nicht gefunden" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Das Passwort ist richtig.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign darf nur während der Paketerstellung benutzt werden" -#: rpmqv.c:915 +#: rpmqv.c:919 #, fuzzy msgid "exec failed\n" msgstr "%s: Öffnen fehlgeschlagen\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "Es wurde kein spec-Datei für die Erstellung angegeben" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "Es wurde keine tar-Datei für die Erstellung angegeben" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "Es wurden keine Pakete für die Signatur angeben" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "Es wurden keine Argumente für die Anfrage angegeben" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "Es wurden keine Argumente für die Überprüfung angegeben" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "Unerwartete Argumente zu --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "Es wurden keine Argumente für die Anfrage angegeben" @@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen\n" # , c-format -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nicht möglich %s zu schreiben" @@ -956,7 +956,7 @@ msgstr "Nicht m msgid "Unable to write payload to %s: %s\n" msgstr "Nicht möglich %s zu schreiben" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1621,49 +1621,49 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # FIXME -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(keine Zahl)" @@ -1719,37 +1719,37 @@ msgstr "" msgid "%10d %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Entfernen von %s fehlgeschlagen: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "kann Datei %s nicht öffnen: " @@ -2028,217 +2028,237 @@ msgstr "Nicht installieren - nur anzeigen, ob es funktionieren w msgid "upgrade package(s)" msgstr "Paket installieren" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "Anfrage an alle Pakete" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "Anfrage-Modus" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "Anfrage nach Paket, das die Datei besitzt" + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "Paket hat keinen Namen" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "Anfrage nach Paket, das die Datei besitzt" + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "Anfrage an alle Pakete" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "Anfrage nach Paket, das die Datei besitzt" + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "Anfrage-Modus" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "Paket hat keinen Namen" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "Anfrage-Modus" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "Anfrage-Modus" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "Anfrage nach Paketen, die die Fähigkeit benötigen" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "Anfrage nach Paketen, die die Fähigkeit bereitstellen" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "Dokumentation installieren" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "Paketinformationen anzeigen" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "Paket installieren" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 #, fuzzy msgid "use the following query format" msgstr "Unerwartete Quelle der Anfrage" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "Anfrage nach Paket, das die Datei besitzt" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr "Dateiliste des Pakets anzeigen" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "Paket installieren" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "Paket installieren" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "Paket installieren" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "Paket installieren" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "Paket installieren" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "Paket installieren" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "Paket installieren" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "Dateiabhängigkeiten nicht überprüfen" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "Keine Stufen ausführen" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "Paket installieren" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "Paket installieren" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "Paket installieren" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "Paket installieren" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "Paketsignatur überprüfen" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "PGP-Signatur generieren" @@ -2328,7 +2348,7 @@ msgid "is needed by" msgstr " wird von %s-%s-%s gebraucht\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2378,32 +2398,32 @@ msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp fehlgeschlagen" @@ -2453,84 +2473,95 @@ msgstr "Paket hat keinen Namen" msgid "can't query %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: »readLead« fehlgeschlagen\n" -#: lib/query.c:691 +#: lib/query.c:709 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "Anfrage von %s fehlgeschlagen\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "Anfrage an alle Pakete" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "kein Paket triggert %s\n" -#: lib/query.c:752 +# , c-format +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Lesen von %s fehlgeschlagen: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "kein Paket triggert %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "kein Paket verlangt %s\n" # oder besser: ... listet %s auf? -ke- -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "kein Paket stellt %s bereit\n" # , c-format -#: lib/query.c:798 +#: lib/query.c:906 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "die Datei »%s« gehört zu keinem Paket\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "ungültige Paket-Nummer: %s\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -3138,85 +3169,85 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "fehlende { nach %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "fehlende } nach %{" # »Tag« übersetzen??? -ke- #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "leeres »Tag«-Format" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "leerer »Tag«-Name" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "unbekannter »Tag«" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] am Ende des Arrays erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "unerwartete ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "unerwartete }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ nach ? im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "} im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr ": nach ? Unterausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 #, fuzzy msgid "{ expected after : in expression" msgstr "{ nach : im Ausdruck erwartet" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "| am Ende des Ausdrucks erwartet" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(unbekannter Typ)" @@ -3287,7 +3318,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3304,255 +3335,255 @@ msgid "%s: cannot read header at 0x%x\n" msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen" # FIXME -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" # FIXME -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # FIXME -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "Fehler beim Löschen des Eintrags %s nach %s" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "»dbpath« ist nicht gesetzt" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "die temporäre Datenbank %s existiert schon" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "Datenbank aus der vorhandenen neu erstellen" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" # , c-format -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(unbekannter Typ)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Paket %s in %s nicht gefunden" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Bad server response" msgstr "Nicht passende Antwort des FTP-Servers" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "FTP IO-Fehler" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Server timeout" msgstr "Timeout des FTP-Servers" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Unable to lookup server host address" msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Unable to lookup server host name" msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 #, fuzzy msgid "Failed to connect to server" msgstr "Verbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "IO-Fehler bei lokaler Datei" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Datei auf dem Server nicht gefunden" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP Unbekannter oder nicht erwarteter Fehler" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/en_RN.po b/po/en_RN.po index 13e2cae..b5760a5 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index 13e2cae..b5760a5 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 13e2cae..b5760a5 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 7379412..5cc612f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -73,258 +73,258 @@ msgstr "virhe etsitt msgid "cannot re-open payload: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "tulosta käytetyn rpm:n versio" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "tulosta käytetyn rpm:n versio" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "lähetä vakiotuloste :lle" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "käytä ylimpänä hakemistona" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM versio %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "käyttö: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Käytä sen sijaan -e tai --erase .\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "vain yksi päämoodi voidaan määritellä" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "odottamaton kyselyn lähde" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "odottamaton kyselyn lähde" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "odottamaton kyselyn lähde" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "vain asennus tai päivitys voidaan pakottaa" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "vain toinen --prefix tai --relocate voidaan antaa" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "--prefix parametrien pitää alkaa /-merkillä" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " @@ -332,7 +332,7 @@ msgid "" msgstr "" "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " @@ -340,7 +340,7 @@ msgid "" msgstr "" "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -349,7 +349,7 @@ msgstr "" "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai " "tarkistettaessa" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" @@ -357,7 +357,7 @@ msgstr "" "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja " "käännettäessä" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -365,84 +365,84 @@ msgstr "" "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, " "kyseltäessä ja tietokannan uudelleenluonnissa" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "parametrit --root (-r):lle alettava /-merkillä" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, fuzzy, c-format msgid "cannot access file %s\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "Tiedostoa ei löytynyt palvelimelta" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign: voidaan käyttää vain paketteja käännettäessä" -#: rpmqv.c:915 +#: rpmqv.c:919 #, fuzzy msgid "exec failed\n" msgstr "%s: avaus ei onnistunut\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "uudelleenkäännolle ei määritelty paketteja" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "käännökselle ei annettu määrittelytiedostoja" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "käännökselle ei määritelty tar-tiedostoja" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "allekirjoitukselle ei määritelty paketteja" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "asennukselle ei määritelty paketteja" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "kyselylle ei annettu parametrejä" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "tarkistukselle ei annettu parametrejä" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "--querytags: odottamattomia parametrejä" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "kyselylle ei annettu parametrejä" @@ -844,7 +844,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Could not open %s: %s\n" msgstr "%s:n avaus epäonnistui\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "%s:n kirjoitus ei onnistu" @@ -874,7 +874,7 @@ msgstr "%s:n kirjoitus ei onnistu" msgid "Unable to write payload to %s: %s\n" msgstr "%s:n kirjoitus ei onnistu" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1512,48 +1512,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(ei ole luku)" @@ -1605,37 +1605,37 @@ msgstr "" msgid "%10d %s\n" msgstr "en voinut avata %s: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "en voi poistaa %s -hakemisto ei ole tyhjä" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s:n rmdir epäonnistui: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "en voinut avata tiedostoa %s: " @@ -1911,217 +1911,237 @@ msgstr " msgid "upgrade package(s)" msgstr "asenna paketti" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "kysele kaikki paketit" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "kyselymoodi" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "kysy pakettia, jonka omistuksessa on" + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "paketilla ei ole nimeä" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "kysy pakettia, jonka omistuksessa on" + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "kysele kaikki paketit" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "kysy pakettia, jonka omistuksessa on" + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "kyselymoodi" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "%s:n kysely ei onnistunut\n" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "paketilla ei ole nimeä" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "kyselymoodi" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "kyselymoodi" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "kysele paketteja, jotka vaativat ominaisuutta" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "kysele paketteja, jotka tarjoavat ominaisuuden" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "listaa vain konfigurointiedostot (josta seuraa -l)" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "asenna dokumentaatio" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "näytä paketin tiedot" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "asenna paketti" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead epäonnistui\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 #, fuzzy msgid "use the following query format" msgstr "odottamaton kyselyn lähde" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "kysy pakettia, jonka omistuksessa on" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr "näytä paketin tiedostolistaus" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "asenna paketti" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "asenna paketti" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "asenna paketti" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "asenna paketti" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "asenna paketti" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "asenna paketti" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "asenna paketti" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "älä tarkista paketin riippuvuuksia" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "älä suorita mitään vaiheita" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "asenna paketti" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "asenna paketti" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "asenna paketti" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "asenna paketti" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "tarkista paketin allekirjoitus" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "generoi PGP-allekirjoitus" @@ -2207,7 +2227,7 @@ msgid "is needed by" msgstr "vaatii %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2256,31 +2276,31 @@ msgstr "paketti %s-%s-%s sis msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "pgp epäonnistui" @@ -2330,82 +2350,92 @@ msgstr "paketilla ei ole nime msgid "can't query %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead epäonnistui\n" -#: lib/query.c:691 +#: lib/query.c:709 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s:n kysely ei onnistunut\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "kysele kaikki paketit" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "mikään paketti ei laukaise %s:a\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "En voi lukea %s: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "mikään paketti ei laukaise %s:a\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "mikään pakettie ei tarvitse %s:a\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "mikään paketti ei tarjoa %s:a\n" -#: lib/query.c:798 +#: lib/query.c:906 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "en voinut avata %s: %s" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "tiedostoa %s ei omista mikään paketti\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "virheellinen paketin numero: %s\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -3006,84 +3036,84 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "puuttuva '{' '%':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "puuttuva '{' '%{':n jälkeen" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "tyhjä nimiön formaatti" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "tyhjä nimiön nimi" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "tuntematon nimiö" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "']' puuttuu taulukkomäärittelyn lopusta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "odottamaton ']'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "odottamaton '}'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "odotin '?'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 #, fuzzy msgid "{ expected after ? in expression" msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "odotin '}'-merkkiä ilmauksessa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 #, fuzzy msgid "{ expected after : in expression" msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa " #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "odotin '}'-merkkiä ilmauksen lopussa" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(tuntematon tyyppi)" @@ -3153,7 +3183,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen" @@ -3168,251 +3198,251 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "en voi lukea headeria %d:stä päivittäessä" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "virhe etsittäessä pakettia %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "virhe poistettaessa tietuetta %s %s:stä" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "väliaikainen tietokanta %s on jo olemassa" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "en voi lisätä tietuetta %d:stä" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(tuntematon tyyppi)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "paketti %s ei ole %s:ssä" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "en voinut avata %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Bad server response" msgstr "Virheellinen FTP-palvelijan vastaus" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "FTP:n IO-virhe" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Server timeout" msgstr "FTP-palvelimen timeout" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Unable to lookup server host address" msgstr "FTP-palvelimen osoitetta ei löytynyt" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Unable to lookup server host name" msgstr "FTP-palvelimen nimeä ei löytynyt" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 #, fuzzy msgid "Failed to connect to server" msgstr "En saanut yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 #, fuzzy msgid "Failed to establish data connection to server" msgstr "En saanut data-yhteyttä FTP-palvelijaan" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "Paikallisen tiedoston IO-virhe" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Virhe asetettaessa palvelinta passiiviin moodiin" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 #, fuzzy msgid "Unknown or unexpected error" msgstr "FTP:n tuntematon tai odottamaton virhe" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 39f7fe6..a2790e5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,278 +79,278 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 #, fuzzy msgid "print the version of rpm being used" msgstr " --version\t\t- affiche la version de rpm utilise" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr " --version\t\t- affiche la version de rpm utilise" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 #, fuzzy msgid "use as the top level directory" msgstr " --root \t- utilise comme rpertoire racine" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Peut tre redistribu librement selon les termes de la GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Utilisez de prfrence -e ou --erase.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "un seul mode majeur peut tre spcifi" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "un seul type de requte/vrification peut tre effectu la fois" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "source de requte inattendue" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "source de requte inattendue" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "source de requte inattendue" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "seules l'installation et la mise jour peuvent tre forces" -#: rpmqv.c:725 +#: rpmqv.c:729 #, fuzzy msgid "files may only be relocated during package installation" msgstr "" "--replacefiles ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:728 +#: rpmqv.c:732 #, fuzzy msgid "only one of --prefix or --relocate may be used" msgstr "un seul mode majeur peut tre spcifi" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--clean ne peut tre spcifi que lors de la construction d'un package" -#: rpmqv.c:734 +#: rpmqv.c:738 #, fuzzy msgid "--prefix may only be used when installing new packages" msgstr "--sign ne peut tre spcifi que lors de la construction d'un package" -#: rpmqv.c:737 +#: rpmqv.c:741 #, fuzzy msgid "arguments to --prefix must begin with a /" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" "--replacefiles ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:757 +#: rpmqv.c:761 #, fuzzy msgid "--excludedocs may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:761 +#: rpmqv.c:765 #, fuzzy msgid "--includedocs may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:765 +#: rpmqv.c:769 #, fuzzy msgid "only one of --excludedocs and --includedocs may be specified" msgstr "un seul mode majeur peut tre spcifi" -#: rpmqv.c:769 +#: rpmqv.c:773 #, fuzzy msgid "--ignorearch may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:773 +#: rpmqv.c:777 #, fuzzy msgid "--ignoreos may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:782 +#: rpmqv.c:786 #, fuzzy msgid "--allmatches may only be specified during package erasure" msgstr "" "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:786 +#: rpmqv.c:790 #, fuzzy msgid "--allfiles may only be specified during package installation" msgstr "" "--replacefiles ne peut tre spcifi que lors de l'installation d'un package" -#: rpmqv.c:791 +#: rpmqv.c:795 #, fuzzy msgid "--justdb may only be specified during package installation and erasure" msgstr "" "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un " "package" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " @@ -359,7 +359,7 @@ msgstr "" "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un " "package" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " @@ -368,7 +368,7 @@ msgstr "" "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un " "package" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -377,7 +377,7 @@ msgstr "" "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un " "package" -#: rpmqv.c:810 +#: rpmqv.c:814 #, fuzzy msgid "" "--test may only be specified during package installation, erasure, and " @@ -386,7 +386,7 @@ msgstr "" "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un " "package" -#: rpmqv.c:815 +#: rpmqv.c:819 #, fuzzy msgid "" "--root (-r) may only be specified during installation, erasure, querying, " @@ -395,85 +395,85 @@ msgstr "" "--root (-r) ne peut tre spcifi que lors de l'installation, de la " "dsinstallation ou de l'interrogation d'un package" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "les arguments de --root (-r) doivent commencer par un /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "La vrification du mot de passe a chou\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Mot de passe correct.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign ne peut tre spcifi que lors de la construction d'un package" -#: rpmqv.c:915 +#: rpmqv.c:919 #, fuzzy msgid "exec failed\n" msgstr "La construction a chou.\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "aucun package n'a t spcifi pour la reconstruction" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:1017 +#: rpmqv.c:1021 #, fuzzy msgid "no tar files given for build" msgstr "aucun package n'a t spcifi pour la construction" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "aucun argument n'a t fourni pour la requte" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "aucun argument n'a t fourni pour la vrification" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "aucun argument n'a t fourni pour la requte" @@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Could not open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1540,48 +1540,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "impossible d'ouvrir: %s\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1631,37 +1631,37 @@ msgstr "" msgid "%10d %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -1944,218 +1944,241 @@ msgid "upgrade package(s)" msgstr "" " -p + - interroge le package (non install) " -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "" +" -f + - interroge le package qui appartient " + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "" +" -f + - interroge le package qui appartient " + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "" +" -f + - interroge le package qui appartient " + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "aucun package n'a t spcifi pour la dsinstallation" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "" " -c - donne uniquement la liste des fichiers de " "configuration (implique -l)" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "" " -d - donne uniquement la liste des fichiers de " "documentation (implique -l)" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "" " -i - affiche les informations relatives un package" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 #, fuzzy msgid "use the following query format" msgstr "source de requte inattendue" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr " -l - affiche la liste des packages" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "impossible d'ouvrir: %s\n" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "" " -f + - interroge le package qui appartient " -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr " --sign - genre une signature PGP" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr " --sign - genre une signature PGP" @@ -2239,7 +2262,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2289,31 +2312,31 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "La construction a chou.\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "La construction a chou.\n" @@ -2363,82 +2386,92 @@ msgstr "aucun package n'a t spcifi pour l'installation" msgid "can't query %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "La construction a chou.\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "impossible d'ouvrir: %s\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "aucun package n'a t spcifi pour l'installation" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a t spcifi pour l'installation" @@ -3033,84 +3066,84 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 #, fuzzy msgid "unexpected ]" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 #, fuzzy msgid "unexpected }" msgstr "source de requte inattendue" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3179,7 +3212,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3194,242 +3227,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "aucun package n'a t spcifi pour l'installation" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 197b9c3..cc80cb0 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -73,353 +73,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,48 +1451,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1829,182 +1829,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2087,7 +2103,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2135,31 +2151,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2207,81 +2223,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2864,82 +2890,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3006,7 +3032,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3021,242 +3047,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 13e2cae..b5760a5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 13e2cae..b5760a5 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/is.po b/po/is.po index fea4f76..0076299 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -73,353 +73,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "prenta útgáfunúmer rpm sem verið er að nota" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "skilgreina fjölva með gildinu " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "prenta útvíkkun fjölva +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "senda frálag í " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "sýna endanlega rpmrc og stillingar fjölva" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM útgáfa %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Þessu má dreifa frjálst samkvæmt skilmálum GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -814,7 +814,7 @@ msgstr "Get ekki lesi msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Get ekki ritað í pakka: %s\n" @@ -844,7 +844,7 @@ msgstr "Get ekki lesi msgid "Unable to write payload to %s: %s\n" msgstr "Get ekki ritað innihald í %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrifaði: %s\n" @@ -1457,48 +1457,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1548,37 +1548,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir %s brást: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s gat ekki eytt %s: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s búið til sem %s\n" @@ -1835,187 +1835,207 @@ msgstr "" msgid "upgrade package(s)" msgstr "uppfæra pakka" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "fyrirspurn/yfirferð á pakkann sam á skrá" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "fyrirspurn/yfirferð á pakkana sem hafa pakkaþarfir" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "fyrirspurn/yfirferð á pakkana sem uppfylla þarfir annara pakka" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "ekki yfirfara stærð skráa" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "ekki yfirfara symlink slóð skráa" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "ekki yfirfara eiganda skráa" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "ekki yfirfara hop skráa" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "ekki yfirfara heimildir skráa" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "ekki yfirfara skrárnar í pakkanum" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "ekki skoða pakkaskilyrðin" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "ekki yfirfara symlink slóð skráa" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "ekki yfirfara SHA1 undirritunina" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ekki yfirfara MD5 undirritun skráa" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "búa til undirskrift" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "búa til undirskrift" @@ -2098,7 +2118,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2146,31 +2166,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "gat ekki opnað %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s brást\n" @@ -2218,81 +2238,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: gat ekki lesið manifest: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Get ekki lesið %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "gat ekki búið til %%%s %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2875,82 +2905,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3017,7 +3047,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3032,242 +3062,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== virkt %d tómt %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tómt)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tómt)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Óþekkt viðfang %c í %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Fjölvi %%%.*s fannst ekki. Sleppi\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Skrá %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Skráin %s er minni en %u bæti\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Tókst" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Þjónninn svaraði rangt" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "Les/ritvilla á þjóninum" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Þjónninn tímaði út" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Gat ekki flett upp vistfangi þjónsins" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Gat ekki flett upp heiti þjónsins" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Gat ekki tengst þjóninum" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Gat ekki opnað gagnatengingu við þjóninn" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "Les/ritvilla í skrána" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Ekki tókst að fá þjóninn í \"passive\" ham" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Skráin fannst ekki á þjóninum" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Er að hætta við" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Óþekkt eða óvænt villa" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "tengist %s sem %s með aðgangsorði %s\n" diff --git a/po/it.po b/po/it.po index 13e2cae..b5760a5 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 012330b..54e0269 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -81,124 +81,124 @@ msgstr " msgid "cannot re-open payload: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "ɸ½à½ÐÎϤò ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 #, fuzzy msgid "Signature options:" msgstr "½ð̾¥µ¥¤¥º: %d\n" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 #, fuzzy msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" @@ -206,72 +206,72 @@ msgstr "" "ËÝÌõ¼Ô ¿ÀÅÄ ½¼ \n" "¸íÌõÅù¤Ï¿ÀÅĤޤÇ" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Þ¤¹" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "»ÈÍÑË¡: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, fuzzy, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Þ¥Ã¥È" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤¹" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»þ¤Î¤ß¶¯À©¤Ç¤­" "¤Þ¤¹" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ßºÆÇÛÃ֤Ǥ­¤Þ¤¹" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" @@ -279,82 +279,82 @@ msgstr "" "--relocate ¤È --excludepath ¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍÑ" "¤Ç¤­¤Þ¤¹" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊý¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -362,13 +362,13 @@ msgid "" msgstr "" "--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -376,83 +376,83 @@ msgstr "" "--root (-r) ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»þ¤Î¤ß»ØÄê¤Ç" "¤­¤Þ¤¹" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "½ð̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, fuzzy, c-format msgid "cannot access file %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó\n" -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "¼Â¹Ô¼ºÇÔ\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "½ð̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" @@ -862,7 +862,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" @@ -892,7 +892,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "½ñ¤­¹þ¤ßÃæ: %s\n" @@ -1535,48 +1535,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)" @@ -1628,37 +1628,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%d ¹ÔÌÜ: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Þ¤¹" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Þ¤»¤ó" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "·Ù¹ð: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤¹" @@ -1944,218 +1944,238 @@ msgstr " msgid "upgrade package(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr " ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr " ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "¥°¥ë¡¼¥×Ãæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹\n" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr " ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr " ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "¥°¥ë¡¼¥×Ãæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹\n" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "" " ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n" "Ì䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr " ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "Á´¤Æ¤Î¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥À¥ó¥×¤·¤Þ¤¹" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹\n" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Þ¤¹" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹" @@ -2250,7 +2270,7 @@ msgid "is needed by" msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -2300,32 +2320,32 @@ msgstr " msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s" -#: lib/psm.c:1520 +#: lib/psm.c:1545 #, fuzzy msgid " on file " msgstr "¥Õ¥¡¥¤¥ë¾å" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s ¼ºÇÔ" @@ -2374,82 +2394,92 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Þ¤»¤ó\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" @@ -3062,83 +3092,83 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Þ¥Ã¥È" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "¶õ¤Î¥¿¥°Ì¾" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "ÉÔÌÀ¤Ê¥¿¥°" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "ͽ´ü¤»¤Ì ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "ͽ´ü¤»¤Ì }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)" @@ -3208,7 +3238,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹" @@ -3223,254 +3253,254 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¥Þ¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¥Þ¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Þ¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Þ¤¹" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¥Þ¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Þ¤¹" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 #, fuzzy msgid "Target buffer overflow\n" msgstr "¥¿¡¼¥²¥Ã¥È¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥Õ¥í¡¼" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ð¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "À®¸ù" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Bad server response" msgstr "¥µ¡¼¥Ð¤«¤éÀµ¾ï¤Ê±þÅú¤¬¤¢¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "¥µ¡¼¥Ð IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Server timeout" msgstr "¥µ¡¼¥Ð¥¿¥¤¥à¥¢¥¦¥È" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Unable to lookup server host address" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Unable to lookup server host name" msgstr "¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 #, fuzzy msgid "Failed to connect to server" msgstr "¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 #, fuzzy msgid "Failed to establish data connection to server" msgstr "¥µ¡¼¥Ð¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "¥µ¡¼¥Ð¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "½èÍýÃæ¤Î¥¢¥Ü¡¼¥È" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 #, fuzzy msgid "Unknown or unexpected error" msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n" diff --git a/po/ko.po b/po/ko.po index 26ba7e1..4ce2d97 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-09-07 22:03+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -73,264 +73,264 @@ msgstr " msgid "cannot re-open payload: %s\n" msgstr "payload¸¦ ´Ù½Ã ¿­ ¼ö ¾øÀ½: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "ÇöÀç »ç¿ë ÁßÀÎ rpm ¹öÀüÀ» Ç¥½ÃÇÕ´Ï´Ù" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "ÀÚ¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "¾ÆÁÖ »ó¼¼ÇÑ Ãâ·ÂÀ» Á¦°øÇÕ´Ï´Ù" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "<º»¹®> ÀÇ ³»¿ë(value)À¸·Î <À̸§> ¸ÅÅ©·Î¸¦ Á¤ÀÇÇÕ´Ï´Ù" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "'<À̸§> <º»¹®>'" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "<Ç¥Çö½Ä>+ ÀÇ ¸ÅÅ©·Î È®ÀåÀ» Ãâ·ÂÇÕ´Ï´Ù" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "<Ç¥Çö½Ä>+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "Ç¥ÁØÃâ·ÂÀ» <¸í·É> À¸·Î º¸³À´Ï´Ù" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "<¸í·É>" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "<µð·ºÅ丮> ¸¦ ÃÖ»óÀ§ µð·ºÅ丮·Î »ç¿ëÇÕ´Ï´Ù" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "<µð·ºÅ丮>" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "±âº» ¸ÅÅ©·Î ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "<ÆÄÀÏ:..>" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "±âº» rpmrc ÆÄÀÏ ´ë½Å <ÆÄÀÏ:..> À» ÀоîµéÀÔ´Ï´Ù" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "ÇöÀç ¼³Á¤µÇ¾î ÀÖ´Â rpmrcÀÇ ³»¿ë°ú ¸ÅÅ©·Î¸¦ º¸¿©ÁÝ´Ï´Ù" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "libio(3) APIÀÇ »ç¿ëÀ» ÇØÁ¦ÇÕ´Ï´Ù" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "µ¥ÀÌÅÍ ½ºÆ®¸² ÇÁ·ÎÅäÄÝÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "rpmio ÀÔ/Ãâ·ÂÀ» µð¹ö±× ÇÕ´Ï´Ù" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "URL ij½Ã Çڵ鸵À» µð¹ö±× ÇÕ´Ï´Ù" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "ÁúÀÇ ¿É¼Ç (-q ¶Ç´Â --query ¿Í ÇÔ²² »ç¿ë):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "°ËÁõ ¿É¼Ç (-V ¶Ç´Â --verify ¿Í ÇÔ²² »ç¿ë):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "¼­¸í ¿É¼Ç:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "µ¥ÀÌÅͺ£À̽º ¿É¼Ç:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" "´ÙÀ½°ú ÇÔ²² »ç¿ëµÉ Á¦ÀÛ ¿É¼Ç [ | | <¼Ò½º ÆÐÅ°Áö> ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "¼³Ä¡/¾÷±×·¹À̵å/»èÁ¦ ¿É¼Ç:" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "¸ðµç rpm ¸ðµå¿¡¼­ÀÇ ÀϹÝÀûÀÎ ¿É¼Ç:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM - %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "ÀÌ ÇÁ·Î±×·¥Àº GNU Public License ³»¿¡¼­ ÀÚÀ¯·Ó°Ô Àç¹èÆ÷µÉ ¼ö ÀÖ½À´Ï´Ù." -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr " »ç¿ë¹ý: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "--rcfile ¿É¼ÇÀÌ Á¦°ÅµÇ¾ú½À´Ï´Ù.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "´ë½Å \"--macros <ÆÄÀÏ:..>\" À» »ç¿ëÇÕ´Ï´Ù.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "(%d) ÀÇ Àμö ó¸® °úÁ¤ Áß ³»ºÎ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "ÇϳªÀÇ ÁÖ¿ä(major) ¸ðµå¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "ÁúÀÇ/°ËÁõ Áß¿¡¼­ ÇÑ°¡Áö À¯ÇüÀº µ¿½Ã¿¡ ¼öÇàµÉ ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "ºÎÀûÀýÇÑ ÁúÀÇ Ç÷¡±× ÀÔ´Ï´Ù" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "ºÎÀûÀýÇÑ ÁúÀÇ Çü½Ä ÀÔ´Ï´Ù" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "ºÎÀûÀýÇÑ ÁúÀÇ ¼Ò½º ÀÔ´Ï´Ù" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath ´Â µ¥ÀÌÅͺ£À̽º¸¦ »ç¿ëÇÏÁö ¾Ê±â À§ÇÑ ¿É¼ÇÀÔ´Ï´Ù" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "¼³Ä¡, ¾÷±×·¹À̵å, ¼Ò½º »èÁ¦, spec ÆÄÀÏ »èÁ¦½Ã¿¡¸¸ ¼öÇàµË´Ï´Ù" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÆÄÀÏÀ» Àç¹èÄ¡ÇÒ ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "--prefix ¶Ç´Â --relocate ¿É¼Ç Áß Çϳª¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate ¿Í --excludepath ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö " "ÀÖ½À´Ï´Ù" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix ¿É¼ÇÀº ÃÖ½ÅÀÇ ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ ¶§¿¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "--prefix ¿É¼ÇÀÇ Àμö´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "--excludedocs ¿Í --includedocs ¿É¼Ç¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches ¿É¼ÇÀº ÆÐÅ°Áö »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "½ºÅ©¸³Æ® ÇØÁ¦ ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "Æ®¸®°Å ÇØÁ¦ ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡¿Í »èÁ¦½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -338,13 +338,13 @@ msgstr "" "--nodeps ¿É¼ÇÀº ÆÐÅ°Áö Á¦ÀÛ, ÀçÁ¦ÀÛ(rebuild), ÀçÄÄÆÄÀÏ(recompile), ¼³Ä¡, »è" "Á¦, °ËÁõ½Ã¿¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "--test ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡, »èÁ¦, Á¦À۽ÿ¡¸¸ ÁöÁ¤ÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -352,82 +352,82 @@ msgstr "" "--root (-r) ¿É¼ÇÀº ÆÐÅ°Áö ¼³Ä¡, »èÁ¦, ÁúÀÇ, µ¥ÀÌÅͺ£À̽º À籸Ãà½Ã¿¡¸¸ ÁöÁ¤ÇÏ" "½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "--root (-r) ¿É¼ÇÀÇ Àμö´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "¼­¸íÇÒ ÆÄÀÏÀÌ ¾ø½À´Ï´Ù\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "%s ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp¸¦ ãÀ» ¼ö ¾øÀ½: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Æнº ±¸¹®(pass phrase) ÀÔ·Â: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Æнº ±¸¹®(pass phrase) °Ë»ç¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Æнº ±¸¹®(pass phrase)ÀÌ ¿Ã¹Ù¸¨´Ï´Ù.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign ¿É¼ÇÀº ÆÐÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆÐÅ°Áö ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "¼­¸íÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù" @@ -822,7 +822,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" @@ -852,7 +852,7 @@ msgstr "%s msgid "Unable to write payload to %s: %s\n" msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "ÀÛ¼º: %s\n" @@ -1475,23 +1475,23 @@ msgstr " msgid "YES" msgstr "¿¹" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1499,26 +1499,26 @@ msgid "" msgstr "" "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "·çÇÁ(LOOP):\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)" @@ -1571,37 +1571,37 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%04o Çã°¡±Ç(perms)ÀÇ %s µð·ºÅ丮°¡ »ý¼ºµÇ¾ú½À´Ï´Ù.\n" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "Çì´õ ÆÄÀÏ ¸ñ·Ï¿¡¼­ ¾ÆÄ«À̺ê ÆÄÀÏ %s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î ÀúÀåµÇ¾ú½À´Ï´Ù\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s %s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: ºó µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s %s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s %s ¸µÅ©¸¦ ÇØÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ý¼ºµÇ¾ú½À´Ï´Ù\n" @@ -1868,191 +1868,211 @@ msgstr " msgid "upgrade package(s)" msgstr "ÆÐÅ°Áö¸¦ ¾÷±×·¹À̵å ÇÕ´Ï´Ù" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "¸ðµç ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõÇÕ´Ï´Ù" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "rpm °ËÁõ ¸ðµå" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "ÆÄÀÏÀ» ¼ÒÀ¯ÇÏ°í ÀÖ´Â ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "ÆÄÀÏÀ» ¼ÒÀ¯ÇÏ°í ÀÖ´Â ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "±×·ì ¾ÈÀÇ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "ÆÄÀÏÀ» ¼ÒÀ¯ÇÏ°í ÀÖ´Â ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "ÆÐÅ°Áö ÆÄÀÏÀ» ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù (¿¹: ¹ÙÀ̳ʸ® *.rpm ÆÄÀÏ)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "ÆÄÀÏÀ» ¼ÒÀ¯ÇÏ°í ÀÖ´Â ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "rpm ÁúÀÇ ¸ðµå" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "ÁúÀÇ Å±׸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "spec ÆÄÀÏ¿¡ ´ëÇØ ÁúÀÇÇÕ´Ï´Ù" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "±×·ì ¾ÈÀÇ ÆÐÅ°Áö¸¦ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "ÆÐÅ°Áö·Î ÀÎÇÏ¿© ¹ß»ýµÇ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇÇÕ´Ï´Ù" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "rpm °ËÁõ ¸ðµå" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "rpm °ËÁõ ¸ðµå (legacy)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "ÀÇÁ¸¼ºÀ» ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "ÀÇÁ¸¼ºÀ» Á¦°øÇÏ´Â ÆÐÅ°Áö¿¡ ´ëÇØ ÁúÀÇ/°ËÁõ ÇÕ´Ï´Ù" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "¸ðµç ¼³Á¤ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "¸ðµç ¹®¼­ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "±âº» ÆÄÀÏ Á¤º¸¸¦ ¾Ë·ÁÁÝ´Ï´Ù" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» ³ª¿­ÇÕ´Ï´Ù" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "%%ghost ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "%%license ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "%%readme ÆÄÀÏÀ» »ý·«ÇÕ´Ï´Ù" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "´ÙÀ½ÀÇ ÁúÀÇ Çü½ÄÀ» »ç¿ëÇϽʽÿä" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "spec ÆÄÀÏ ¾ÈÀÇ i18n Ç׸ñ(section)À» ´ëü(substitute)ÇÕ´Ï´Ù" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "³ª¿­µÈ ÆÄÀÏÀÇ »óÅÂ(state)¸¦ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "ÆÄÀÏ ¸ñ·ÏÀ» ÀÚ¼¼È÷ º¸¿©ÁÝ´Ï´Ù" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "ÆÄÀÏÀÇ ¿ë·®À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "ÆÄÀÏÀÇ ¼ÒÀ¯ÀÚ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "ÆÄÀÏÀÇ ±×·ìÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "ÆÄÀÏÀÇ ÃÖÁ¾ º¯°æ ½Ã°£À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "ÆÄÀÏÀÇ ¸ðµå¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "ÆÐÅ°Áö ¾ÈÀÇ ÆÄÀÏÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "ÆÐÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "%verifyscript¸¦ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "ÆÐÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù" @@ -2143,7 +2163,7 @@ msgid "is needed by" msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n" @@ -2197,31 +2217,31 @@ msgstr "" "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï" "´Ù\n" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n" @@ -2269,81 +2289,91 @@ msgstr " msgid "can't query %s: %s\n" msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù, ÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s ±×·ìÀº ¾î¶² ÆÐÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆÐÇÔ: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s ÆÄÀÏÀº ¾î¶² ÆÐÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -2942,82 +2972,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "'%' µÚ¿¡ '{' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "'%{' µÚ¿¡ '}' ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "ÅÂ±× Çü½ÄÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "ÅÂ±× À̸§ÀÌ ºñ¾îÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "¾Ë ¼ö ¾ø´Â ÅÂ±× ÀÔ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "¹è¿­ÀÇ ³¡ºÎºÐ¿¡ ']' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "ºÒÇÊ¿äÇÑ ']' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "ºÒÇÊ¿äÇÑ '}' °¡ »ç¿ëµÇ°í ÀÖ½À´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "Ç¥Çö½Ä¿¡ '?' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "Ç¥Çö½Ä¿¡¼­ '?' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "Ç¥Çö½Ä¿¡ '}' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "ÇϺΠǥÇö½Ä(subexpression)ÀÇ '?' ´ÙÀ½¿¡ ':' ÀÌ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "Ç¥Çö½Ä¿¡¼­ ':' µÚ¿¡ '{' °¡ ÇÊ¿äÇÕ´Ï´Ù" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "Ç¥Çö½ÄÀÇ ³¡ºÎºÐ¿¡ '|' °¡ ÇÊ¿äÇÕ´Ï´Ù" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(¾Ë ¼ö ¾ø´Â À¯Çü)" @@ -3091,7 +3121,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "ÆÐÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ý·«ÇÕ´Ï´Ù.\n" @@ -3106,244 +3136,244 @@ msgstr "rpmdb: msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "%2$s À妽º¿¡¼­ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "»õ·Î¿î ÆÐÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ýÇß½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »ý¼ºÇÔ: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆÐÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s µð·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆÐÇÔ: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== %d È°¼º, %d ºñ¾îÀÖÀ½\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ºñ¾îÀÖÀ½)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ºñ¾îÀÖÀ½)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "¸ÅÅ©·Î %%%s ¿¡ Á¾·áµÇÁö ¾ÊÀº ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "¸ÅÅ©·Î %%%s ¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "¸ÅÅ©·Î %%%s ¿¡ Á¾·áµÇÁö ¾ÊÀº ¿É¼ÇÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "¸ÅÅ©·Î %%%s ¿¡ ºñ¾îÀÖ´Â ³»¿ë(body)ÀÌ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "¸ÅÅ©·Î %%%s (À»)¸¦ È®Àå(expand)Çϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "¸ÅÅ©·Î %%%s ¿¡ ºÎÀûÇÕÇÑ À̸§ÀÌ ÀÖ½À´Ï´Ù (%%undefine)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "¸ÅÅ©·Î %%%s (%s) (Àº)´Â ·¹º§ %d ÀÌÇÏ¿¡¼­´Â »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%2$s(%3$s) ¿¡ ¾Ë ¼ö ¾ø´Â ¿É¼Ç %1$c (ÀÌ)°¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "¹Ýº¹ Ƚ¼ö(%d)°¡ ÃÖ´ëÄ¡(%d) º¸´Ù Å®´Ï´Ù\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "Á¾·áµÇÁö ¾ÊÀº %c: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "ºÐ¼®ÇÒ ¼ö ¾ø´Â ¸ÅÅ©·Î ´ÙÀ½¿¡ '%%' °¡ ÀÖ½À´Ï´Ù\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "¸ÅÅ©·Î %%%.*s (À»)¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù, »ý·«ÇÕ´Ï´Ù\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "¸ñÇ¥´ë»ó(Target) ¹öÆÛ ¿À¹öÇ÷οì\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "%s ÆÄÀÏ: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s ÆÄÀÏÀÌ %u ¹ÙÀÌÆ® ¿ë·®º¸´Ù Àû½À´Ï´Ù\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "¼º°ø" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "¼­¹ö ÀÀ´äÀÌ À߸øµÇ¾ú½À´Ï´Ù" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "¼­¹ö ÀÔ/Ãâ·Â ¿À·ùÀÔ´Ï´Ù" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "¼­¹ö ´ë±â½Ã°£ÀÌ ÃÊ°úµÇ¾ú½À´Ï´Ù" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "¼­¹ö È£½ºÆ® ÁÖ¼Ò¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "¼­¹ö È£½ºÆ® À̸§À» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "¼­¹ö¿¡ Á¢¼ÓÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "¼­¹ö·Î ÀÚ·á Á¢¼ÓÀ» ½ÃµµÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "·ÎÄà ÆÄÀÏ¿¡ ÀÔ/Ãâ·Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" "¿ø°Ý ¼­¹ö¸¦ ¼öµ¿ ¸ðµå(passive mode)·Î ¼³Á¤ÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "¼­¹ö¿¡¼­ ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "ÁøÇàÀÌ ÁߴܵǾú½À´Ï´Ù" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "¾Ë ¼ö ¾ø´Â ȤÀº ¿¹»óÄ¡ ¸øÇÑ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s ¿¡ %s (À¸)·Î ±â·Ï(logging)ÇÕ´Ï´Ù, pw %s\n" diff --git a/po/no.po b/po/no.po index 8e74e05..1832450 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -73,251 +73,251 @@ msgstr "feil under lesing av header fra pakke\n" msgid "cannot re-open payload: %s\n" msgstr "kan ikke gjenåpne \"payload\": %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "skriv ut hvilken versjon av rpm som brukes" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "gi mindre detaljert info" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "gi mer detaljert info" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "definer makro med verdi " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "skriv ut makroutvidelsen av +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "send stdout til " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "bruk som toppnivåkatalog" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "les i stedet for standard makrofil(er)" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "les i stedet for standard rpmrc-fil(er)" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "vis endelig rpmrc og makrokonfigurasjon" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "slå av bruk av libio(3) API" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "feilsøking på protokoll-datastrøm" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "feilsøk rpmio I/U" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "feilsøk URL-cache håndtering" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM versjon %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright © 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Bruk: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Bruk -e eller --erase i stedet.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Intern feil i argumentprosesseringen (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "kun ett større modi kan spesifiseres" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "én type spørring/verifisering kan utføres om gangen" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "uventede flagg for spørring" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "ventet spørringsformat" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "uventet spørringskilde" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath oppgitt for operasjon som ikke bruker en database" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "filer kan kun omplasseres under pakkeinstallasjon" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "kune en av --prefix eller --relocate kan brukes" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate og --excludepath kan kun brukes ved installasjon av nye pakker" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix kan kun brukes ved installasjon av nye pakker" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumenter til --prefix må begynne med en /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent kan kun spesifiseres under pakkeinstallasjon" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" @@ -325,7 +325,7 @@ msgstr "" "skript som slår av alternativer kan kun spesifiseres under pakkeinstallasjon " "og sletting" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" @@ -333,100 +333,100 @@ msgstr "" "alternativer som slår av utløsing kan kun spesifiseres under " "pakkeinstallasjon, og sletting" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "ingen filer å signere\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "kan ikke aksessere fil %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp ikke funnet: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Skriv inn passord: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Passordsjekk feilet\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Passord er ok.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "kjøring feilet\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ingen pakkefiler oppgitt for ombygging" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "ingen spec-fil oppgitt for bygging" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "ingen tar-fil oppgitt for bygging" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "ingen pakker oppgitt for signering" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "ingen pakker oppgitt for installering" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "ingen argumenter oppgitt for spørring" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "ingen argumenter oppgitt for verifisering" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "uventede argumenter til --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "ingen argumenter oppgitt for spørring" @@ -825,7 +825,7 @@ msgstr "Kunne ikke msgid "Could not open %s: %s\n" msgstr "Kunne ikke åpne %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunne ikke skrive pakke: %s\n" @@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "Kunne ikke skrive \"payload\" til %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1472,48 +1472,48 @@ msgstr "NEI" msgid "YES" msgstr "JA" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1563,37 +1563,37 @@ msgstr "" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s feilet: Katalogen er ikke tom\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s feilet: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s feilet: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" @@ -1855,190 +1855,210 @@ msgstr "ikke installer, men si ifra om det ville virke eller ikke" msgid "upgrade package(s)" msgstr "oppgrader pakke(r)" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "spør/verifiser alle pakker" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "rpm spørremodus" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "spør/verifiser pakke(r) som eier fil" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "spør/verifiser pakke(r) som eier fil" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "spør/verifiser pakke(r) i gruppe" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "spør/verifiser pakke(r) som eier fil" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "spør/verifiser pakker utløst av " -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "spør/verifiser pakke(r) som eier fil" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "rpm spørremodus" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "vis kjente tagger for spørring" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "spørring på spec-fil" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "spør/verifiser pakke(r) i gruppe" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "spør pakker utløst av " -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "spør etter etter pakker som trenger funksjonalitet" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "spør etter pakker som tilbyr funksjonalitet" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "ikke verifiser størrelse på filer" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "ikke verifiser sti til symbolske lenker for filer" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "ikke verifiser eier av filer" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "ikke verifiser gruppe for filer" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "ikke verifisert endringsdato for filer" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "ikke verifiser modus for filer" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "ikke verifiser filer i pakke" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "ikke verifiser pakkeavhengigheter" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "ikke kjør %verifyscript (hvis noen)" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "ikke verifiser header SHA1 digest" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "ikke verifiser sti til symbolske lenker for filer" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "ikke verifiser header SHA1 digest" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "signer en pakke (forkast nåværende signatur)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "verifiser pakkesignatur" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "signer en pakke (forkast nåværende signatur)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "generer signatur" @@ -2123,7 +2143,7 @@ msgid "is needed by" msgstr " kreves av %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatype %d ikke støttet\n" @@ -2171,31 +2191,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s feilet\n" @@ -2243,81 +2263,91 @@ msgstr "pakken har verken fileier eller id-lister\n" msgid "can't query %s: %s\n" msgstr "kan ikke spørre på %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "feil under åpning av %s: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "spørring på %s feilet\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "kildepakker i gammelt format kan ikke spørres\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: lesing av manifest feilet: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "ingen pakker\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "gruppe %s inneholder ingen pakker\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "ingen pakke utløser %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "kunne ikke opprette %s: %s\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "ingen pakke utløser %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "ingen pakke krever %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "ingen pakke gir %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s eies ikke av noen pakke\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "ugyldig pakkenummer: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "pakke %s er ikke installert\n" @@ -2902,82 +2932,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "mangler { etter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "mangler } etter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(ukjent type)" @@ -3044,7 +3074,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3059,242 +3089,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Overflyt i målbuffer\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Fil %s er mindre enn %u bytes\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index b95ae98..762ff4f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -80,270 +80,270 @@ msgstr "b msgid "cannot re-open payload: %s\n" msgstr "nie mo¿na otworzyæ pliku %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "wy¶wietl wersjê u¿ywanego rpm-a" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "wy¶wietl wersjê u¿ywanego rpm-a" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "przeka¿ standartowe wyj¶cie do " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "u¿yj jako katalogu najwy¿szego poziomu" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 #, fuzzy msgid "Signature options:" msgstr "Rozmiar sygnatury: %d\n" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "plik %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM wersja %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 #, fuzzy msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "U¿ycie: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "U¿yj -e lub --erase\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "tylko jeden typ odpytywania/sprawdzania mo¿na wykonaæ na raz" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "b³êdna konstrukcja argumentów odpytywania" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "b³êdna konstrukcja argumentów odpytywania" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "b³êdna konstrukcja argumentów odpytywania" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate i --excludepath mo¿na u¿yæ tylko w trakcie instalacji nowych " "pakietów" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix mo¿na u¿yæ tylko w trakcie instalacji nowych pakietów" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -352,14 +352,14 @@ msgstr "" "--nodeps mo¿na u¿yæ tylko w trakcie budowania, instalacji, usuwania lub " "sprawdzania pakietów" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" "--test mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub budowania pakietów" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -367,82 +367,82 @@ msgstr "" "--root (-r) mo¿na u¿yæ tylko w trakcie instalacji, usuwania, sprawdzania " "pakietów lub przebudowywania bazy" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "brak dostêpu do pliku %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "nie znaleziono pgp: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Podaj has³o: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Weryfikacja has³a nieudana\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Has³o jest prawid³owe.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "B³êdny %%_signature spec w pliku makra.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "wykonanie nie powiod³o siê\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "nie podano nazw pakietów do przebudowania" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "nie podano nazw plików spec do budowania" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "nie podano nazw plików tar do budowania" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "nie podano nazwy pakietu do podpisania" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "nie podano nazw plików do zainstalowania" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "nie podano argumentów dla trybu zapytañ" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "nie podano argumentów dla sprawdzania" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "nieoczekiwane argumenty dla --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "nie podano argumentów dla trybu zapytañ" @@ -852,7 +852,7 @@ msgstr "Nie mo msgid "Could not open %s: %s\n" msgstr "Nie mo¿na otworzyæ %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" @@ -882,7 +882,7 @@ msgstr "Nie mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie mo¿na zapisaæ pakietu: %s" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1518,48 +1518,48 @@ msgstr "NIE DOBRZE" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "usuwanie indeksu grupy\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(nie jest liczb±)" @@ -1611,37 +1611,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linia %d: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "ostrze¿enie: %s zapisany jako %s" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "skasowanie katalogu %s nie powiod³o siê" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "ostrze¿enie: %s utworzony jako %s" @@ -1918,209 +1918,229 @@ msgstr "nie instaluj, podaj tylko czy instalacja zadzia msgid "upgrade package(s)" msgstr " --upgrade " -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "odpytuj wszystkie pakiety" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "tryb odpytywania" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "zapytaj do jakiego pakietu nale¿y " -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "zapytaj do jakiego pakietu nale¿y " + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "odpytywanie pakietów w grupie" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "zapytaj do jakiego pakietu nale¿y " + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "odpytywanie pakietu" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "zapytaj do jakiego pakietu nale¿y " + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "tryb odpytywania" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "odpytywanie pliku spec" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "odpytywanie pakietów w grupie" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "odpytywanie pakietów zahaczanych przez pakiet" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "tryb odpytywania" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "tryb odpytywania" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "odszukaj pakiety wymagaj±ce zasobu " -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "odszukaj pakiety udostêpniaj±ce zasób " -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "wy¶wietl wszystkie pliki konfiguracyjne" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "wy¶wietl wszystkie pliki dokumentacji" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "podaj postawowe informacje o pliku" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "wy¶wietl pliki zawarte w pakiecie" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "u¿yj nastêpuj±cego formatu zapytania" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "pakiet ¼ród³owy nie zawiera pliku .spec" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "wy¶wietl status pokazywanych plików" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "wy¶wietl wiêcej informacji o plikach z listy" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "nie sprawdzaj zale¿no¶ci pakietu" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "nie wykonuj ¿adnych etapów" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "nie sprawdzaj plików pakietu" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "sprawd¼ sygnaturê pakietu" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "generuj sygnaturê PGP/GPG" @@ -2208,7 +2228,7 @@ msgid "is needed by" msgstr " jest wymagany przez %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Typ danych %d nie jest obs³ugiwany\n" @@ -2258,31 +2278,31 @@ msgstr "pakiet: %s-%s-%s test plik msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s nie istnieje - u¿yto grupy root" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " na pliku " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s nie powiod³o siê" @@ -2331,82 +2351,92 @@ msgstr "pakiet nie ma ani w msgid "can't query %s: %s\n" msgstr "nie mo¿na odwi±zaæ %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "odpytywanie %s nie powiod³o siê\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead nie powiod³o siê\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "znaleziono %d pakietów\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s nie zawiera ¿adnych pakietów\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "¿aden pakiet nie zahacza %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Odczytanie %s nie powiod³o siê: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "¿aden pakiet nie zahacza %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "¿aden pakiet nie wymaga %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "¿aden pakiet nie udostêpnia %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "plik %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "plik %s nie nale¿y do ¿adnego pakietu\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "b³êdny numer pakietu: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "numer rekordu pakietu: %d\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -3010,83 +3040,83 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "brak { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "brak } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "pusty format etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "pusta nazwa etykiety" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "nieznana etykieta" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "spodziewany ] na koñcu tablicy" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "nie spodziewany ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "nie spodziewany }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "spodziewany ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "spodziewany { po ? w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "spodziewany } w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "spodziewany : po podwyra¿eniu ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "spodziewany { po : w wyra¿eniu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "spodziewany | na koñcu wyra¿enia" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(nieznany typ)" @@ -3159,7 +3189,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto" @@ -3174,246 +3204,246 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "usuwanie indeksu grupy\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "usuwanie indeksu nazw\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "b³±d szukania pakietu %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "zmiana nazwy %s na %s\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "¶cie¿ka bazy danych nie zosta³a podana" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "odbudowywujê bazê danych w rootdir %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "tymczasowa baza danych %s ju¿ istnieje" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otwieranie starej bazy danych\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otwieranie nowej bazy danych\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "zamiana starej bazy na now± nie powiod³a siê!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "naprawcze zastêpowanie plików w %s plikami z %s" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "tworzenie katalogu: %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktywny %d pusty %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(pusty)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(pusty)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s ma niezakoñczon± strukturê" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s ma niezakoñczone opcje" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s nie zawiera ¿adnych poleceñ" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Rozwiniêcie makra %%%s nie powiod³o siê" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Nieznana opcja %c in %s(%s)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Niezakoñczone %c: %s" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Napotkano nieprzetwarzalne makro po %%" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Nie znaleziono makra %%%.*s, makro pominiête" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 #, fuzzy msgid "Target buffer overflow\n" msgstr "Przepe³nienie bufora docelowego" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Plik %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Plik %s jest mniejszy ni¿ %d bajtów" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Sukces" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "B³êdna odpowied¼ serwera" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "B³±d WE/WY(IO) serwera" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Przekroczony limit czasu serwera" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Nie mo¿na znale¼æ adresu serwera" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Nie mo¿na znale¼æ nazwy serwera" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Po³±czenie z serwerem nie powiod³o siê" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "B³±d WE/WY(IO) na lokalnym pliku" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Plik nie zosta³ znaleziony na serwerze" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Przerywanie ..." -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Nieznany lub nieoczekiwany b³±d" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logowanie do %s jako %s, has³o %s\n" diff --git a/po/pt.po b/po/pt.po index 96ac84d..21f86b2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2000-06-22 01:13+01:00\n" "Last-Translator: José Nuno Coelho Sanarra Pires\n" "Language-Team: pt \n" @@ -73,356 +73,356 @@ msgstr "erro ao ler o cabe msgid "cannot re-open payload: %s\n" msgstr "não consigo aceder de novo ao conteúdo: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "imprime a versão do RPM que está a usar" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "devolver um resultado menos detalhado" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "devolver um resultado mais detalhado" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "define a macro com o valor " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "imprimir a expansão da macro +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "manda o stdout para " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "usa como a directoria de topo" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "ler o em vez do(s) ficheiro(s) de macros por omissão" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "ler o em vez do(s) ficheiro(s) rpmrc por omissão" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "mostra a configuração final do rpmrc e das macros" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "desactivar o uso da API da libio(3)" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "depurar a sequência de dados do protocolo" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "depurar a E/S da rpmio" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "depurar a gestão da 'cache' de URLs" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "Opções de pesquisa (com o -q ou o --query):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "Opções de verificação (com o -V ou o --verify):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "Opções de assinatura:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "Opções da base de dados:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "Opções de criação com [ | | ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "Opções comuns para todos os modos do rpm:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "ficheiro %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM versão %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Este programa pode ser distribuído livremente sob os termos da GPL da GNU" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Utilização: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "A opção --rcfile foi eliminada.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Usar o \"--macros \" em alternativa.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Erro interno no processamento de argumentos (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "só pode ser especificado um 'major mode'" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "só pode ser realizado um tipo de pesquisa/verificação de cada vez" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "opções de pesquisa inesperadas" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "formato de pesquisa inesperado" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "origem de pesquisa inesperada" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "o --dbpath foi usado numa operação que não precisa duma base de dados" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "só a instalação, a actualização, o rmsource e o rmpspec podem ser forçados" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "os ficheiros só podem ser mudados de sítio durante a instalação do pacote" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "só uma das opções --prefix ou --relocate pode ser usada" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "o --relocate e o --excludepath só podem ser usados ao instalar pacotes novos" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "o --prefix só pode ser usado ao instalar pacotes novos" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "os argumentos do --prefix têm de começar por /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "o --hash (-h) só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "o --percent só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "o --replacefiles só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "o --replacepkgs só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "o --excludedocs só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "o --includedocs só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "só uma das opções --excludedocs e --includedocs pode ser usada" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "o --ignorearch só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "o --ignoreos só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "o --ignoresize só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "o --allmatches só pode ser indicado ao apagar o pacote" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "o --allfiles só pode ser indicado durante a instalação do pacote" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "o --justdb só pode ser indicado durante a instalação ou a remoção do pacote" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "o --justdb só pode ser indicado durante a instalação ou a remoção do pacote" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "o --notriggers só pode ser usado durante a instalação ou remoção do pacote" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "o --nodeps só pode ser indicado durante a criação, reconstrução, recompilação, instalação, remoção ou verificação do pacote" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "o --test só pode ser indicado durante a instalação, remoção ou criação do pacote" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "o --root (-r) só pode ser indicado durante a instalação, remoção ou pesquisa do pacote ou na reconstrução da base de dados" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "os argumentos do --root (-r) têm de começar por /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "não existem ficheiros a assinar\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "não consigo aceder ao ficheiro %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp não encontrado: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Indique a palavra-chave: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "A verificação da palavra-chave falhou\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "A palavra-chave está correcta.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Spec %%_signature inválido no ficheiro de macros.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "o --sign só pode ser usado na criação do pacote" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "o exec falhou\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "não foram indicados pacotes para a reconstrução" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "não foram indicados ficheiros spec para a criação" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "não foram indicados ficheiros tar para a criação" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "não foram indicados pacotes para assinar" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "não foram indicados pacotes para instalar" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "não foram indicados argumentos para a pesquisa" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "não foram indicados argumentos para a verificação" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "argumentos inesperados no --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "não foram indicados argumentos para a pesquisa" @@ -823,7 +823,7 @@ msgstr "N msgid "Could not open %s: %s\n" msgstr "Não consigo aceder ao %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Não consegui gravar o pacote: %s\n" @@ -853,7 +853,7 @@ msgstr "N msgid "Unable to write payload to %s: %s\n" msgstr "Não consegui escrever o conteúdo de %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Gravei: %s\n" @@ -1473,48 +1473,48 @@ msgstr "N msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "=========== a guardar as relações do tsort\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== só os sucessores (ordem de apresentação)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "CICLO:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== a prosseguir o tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(não é um número)" @@ -1566,37 +1566,37 @@ msgstr "" msgid "%10d %s\n" msgstr "linha %d: %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "não consigo remover a %s - a directoria não está vazia\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "o rmdir da %s falhou: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" @@ -1860,198 +1860,218 @@ msgstr "n msgid "upgrade package(s)" msgstr "actualizar o pacote" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "pesquisar/verificar todos os pacotes" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "modo de verificação do rpm" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "pesquisar/verificar o(s) pacote(s) no grupo" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "pesquisar/verificar um ficheiro do pacote (i.e. um ficheiro *.rpm binário)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "pesquisar/verificar o(s) pacote(s) que contém(êm) o ficheiro" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "modo de pesquisa do rpm" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "mostrar as opções de pesquisa conhecidas" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "pesquisar um ficheiro spec" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "pesquisar/verificar o(s) pacote(s) no grupo" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "pesquisar o(s) pacote(s) activados pelo pacote" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "modo de verificação do rpm" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "modo de verificação do rpm (antigo)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependência" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependência" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "listar todos os ficheiros de configuração" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "listar todos os ficheiros de documentação" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "apresentar a informação básica do ficheiro" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "listar os ficheiros no pacote" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr ":%s: o readLead falhou\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "usar o formato de pesquisa seguinte" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "substituir as secções i18n no ficheiro spec" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "mostrar os estados dos ficheiros listados" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "mostrar uma listagem descritiva do ficheiro" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "não verifica as dependências do pacote" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "não executar o %verifyscript (se existir)" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "não verificar os ficheiros no pacote" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "assinar um pacote (retira a assinatura actual)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "verificar a assinatura do pacote" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "assinar um pacote (retira a assinatura actual)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "gerar a assinatura PGP/GPG" @@ -2137,7 +2157,7 @@ msgid "is needed by" msgstr " é necessário pelo %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "O tipo de dados %d não é suportado\n" @@ -2185,31 +2205,31 @@ msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "o utilizador %s não existe - a usar o root\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "o grupo %s não existe - a usar o root\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " no ficheiro " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "falhei ao aceder ao %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "O %s falhou\n" @@ -2257,81 +2277,91 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n" msgid "can't query %s: %s\n" msgstr "não consigo pesquisar o %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "o acesso ao %s falhou: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "a pesquisa do %s falhou\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: O fread falhou: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "nenhum pacote\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "o grupo %s não contém nenhum pacote\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "nenhum pacote activa o %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Não consegui ler o %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "nenhum pacote activa o %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "nenhum pacote precisa do %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "nenhum pacote oferece o %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "ficheiro %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "o ficheiro %s não pertence a nenhum pacote\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "número de pacote inválido: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "número de registo do pacote: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "o registo %d não pôde ser lido\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "o pacote %s não está instalado\n" @@ -2926,82 +2956,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "falta um { depois do %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "falta um } depois do %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "formato da opção em branco" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "nome da opção em branco" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "opção desconhecida" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] esperado no fim do vector" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "] inesperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "} inesperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "esperado um ? na expressão" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "esperado um { a seguir ao ? na expressão" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "esperado um } na expressão" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "esperado um : a seguir à sub-expressão ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "esperado um { a seguir ao : na expressão" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "esperado um | no fim da expressão" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(tipo desconhecido)" @@ -3069,7 +3099,7 @@ msgstr "est msgid "error(%d) counting packages\n" msgstr "erro(%d) ao contar os pacotes\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "o número do registo %d na base de dados está errado -- a ignorar.\n" @@ -3084,242 +3114,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "a remover o \"%s\" do índice %s.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "a remover %d registos do índice %s.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "erro(%d) ao criar uma nova instância do pacote\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "a adicionar o \"%s\" ao índice %s.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "a adicionar %d registos ao índice %s.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "a reconstruir a base de dados %s em %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "A base de dados temporária %s já existe\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "a criar a directoria %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "a criar a directoria %s: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "a abrir a base de dados antiga com a dbapi %d\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "a abrir a base de dados nova com a dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %d\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "a remover a directoria %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== activo %d vazio %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(vazio)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(vazio)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "A macro %%%s tem o conteúdo incompleto\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "A macro %%%s tem um nome inválido (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "A macro %%%s tem as opções incompletas\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "A macro %%%s tem o conteúdo em branco\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "A macro %%%s não conseguiu ser expandida\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "A macro %%%s tem um nome ilegal (%%%undefine)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "A macro %%%s (%s) não foi usada abaixo do nível %d\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Opção desconhecida %c em %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Nível de recursividade(%d) maior que o máximo(%d)\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c não terminado: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Segue-se uma macro impossível de analisar ao %%\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "A macro %%%.*s não foi encontrada, por isso foi ignorada\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Sobrecarga do tampão de destino\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Ficheiro %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "O ficheiro %s tem menos de %u bytes\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Sucesso" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Resposta errada do servidor" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "Erro de E/S do servidor" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Tempo de espera pelo servidor expirado" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Incapaz de descobrir o endereço da máquina do servidor" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Incapaz de descobrir o nome da máquina do servidor" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Não consegui ligar ao servidor" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Não consigo estabelecer uma ligação de dados ao servidor" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "Erro de E/S no ficheiro local" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Erro ao configurar o servidor remoto para o modo passivo" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Ficheiro não encontrado no servidor" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Interrupção em progresso" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Erro desconhecido ou inesperado" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "a ligar ao %s como %s com senha %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b582c8d..e4e5835 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" #: build.c:36 #, fuzzy @@ -77,114 +77,114 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "mostra a verso do programa rpm sendo usado" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "mostra a verso do programa rpm sendo usado" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "envia a saida padro para " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "use como diretrio raiz" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" # , c-format #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" @@ -197,160 +197,160 @@ msgstr "No consegui ler o arquivo spec de %s\n" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM verso %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" "Este Software pode ser livremente redistribuido sob os termos da Licensa " "Pblica GNU (GPL)" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "uso: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Use -e ou --erase no lugar.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "somente um modo principal pode ser especificado" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "um tipo de pesquisa/verificao pode ser feita por vez" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "fonte de pesquisa no esperado" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "fonte de pesquisa no esperado" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "fonte de pesquisa no esperado" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath passado para uma operao que no usa um banco de dados" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "somente instalao e atualizao podem ser foradas" -#: rpmqv.c:725 +#: rpmqv.c:729 #, fuzzy msgid "files may only be relocated during package installation" msgstr "--percent somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:728 +#: rpmqv.c:732 #, fuzzy msgid "only one of --prefix or --relocate may be used" msgstr "somente um entre --excludedocs e --includedocs pode ser especificado" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumentos para --prefix devem comear com uma /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" "--hash (-h) somente podem ser especificado durante instalaes de pacotes" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--percent somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" "--replacepkgs somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" "--excludedocs somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" "--includedocs somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "somente um entre --excludedocs e --includedocs pode ser especificado" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" "--ignorearch somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" "--allmatches somente pode ser especificado durante desinstalaes de pacotes" -#: rpmqv.c:786 +#: rpmqv.c:790 #, fuzzy msgid "--allfiles may only be specified during package installation" msgstr "--percent somente pode ser especificado durante instalaes de pacotes" -#: rpmqv.c:791 +#: rpmqv.c:795 #, fuzzy msgid "--justdb may only be specified during package installation and erasure" msgstr "" "--test somente pode ser especificado durante [des]instalaes e construes de " "pacotes" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " @@ -359,7 +359,7 @@ msgstr "" "--test somente pode ser especificado durante [des]instalaes e construes de " "pacotes" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " @@ -368,7 +368,7 @@ msgstr "" "--test somente pode ser especificado durante [des]instalaes e construes de " "pacotes" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -377,7 +377,7 @@ msgstr "" "--nodeps somente pode ser especificado durante [des]instalaes e verificaes " "de pacotes" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" @@ -385,7 +385,7 @@ msgstr "" "--test somente pode ser especificado durante [des]instalaes e construes de " "pacotes" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -393,84 +393,84 @@ msgstr "" "--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas " "e reconstruo de bancos de dados" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argumentos para --root (-r) devem comear com uma /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "no foi passado pacote para desinstalao" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Checagem de pass phrase falhou\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Pass phrase ok.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign somente pode ser usado durante a construo de pacotes" -#: rpmqv.c:915 +#: rpmqv.c:919 #, fuzzy msgid "exec failed\n" msgstr "Construo falhou.\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "no foram passados pacotes para reconstruo" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "no foi passado arquivo spec para construo" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "no foram passados arquivos tar para construo" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "no foram passados pacotes para assinatura" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "no foi passado pacote para instalao" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "no foi passado argumento para pesquisa" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "no foi passado argumento para verificao" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "argumentos no esperados em --querytags" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "no foi passado argumento para pesquisa" @@ -912,7 +912,7 @@ msgid "Could not open %s: %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "No consegui abrir: %s\n" @@ -947,7 +947,7 @@ msgstr "No consegui abrir: %s\n" msgid "Unable to write payload to %s: %s\n" msgstr "No consegui abrir: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1629,49 +1629,49 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" # , c-format -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "No consegui abrir: %s\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1725,40 +1725,40 @@ msgstr "" msgid "%10d %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" # , c-format -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "No consegui abrir: %s\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "Construo falhou.\n" # , c-format -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "No consegui abrir: %s\n" @@ -2034,218 +2034,238 @@ msgstr "no instale, mas diga se a instalao funcionar ou no" msgid "upgrade package(s)" msgstr "instale pacote" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "pesquise todos os pacotes" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "modo pesquisa" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "pesquise o pacote ao qual pertence" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "pesquise o pacote ao qual pertence" + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "no foi passado pacote para desinstalao" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "pesquise o pacote ao qual pertence" + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "pesquise todos os pacotes" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "pesquise o pacote ao qual pertence" + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "modo pesquisa" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "pesquise todos os pacotes" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "no foi passado pacote para desinstalao" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "pesquise o pacote ao qual pertence" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "modo pesquisa" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "modo pesquisa" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "pesquise pacotes que requerem capacidade " -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "pesquise pacotes que fornecem a capacidade " -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "liste somente os arquivos de configurao (implica -l)" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "instale documentao" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "mostre informao do pacote" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "instale pacote" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" # , c-format -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "No consegui abrir: %s\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 #, fuzzy msgid "use the following query format" msgstr "fonte de pesquisa no esperado" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "pesquise o pacote ao qual pertence" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr "mostre a lista de arquivos do pacote" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "instale pacote" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "instale pacote" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "instale pacote" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "instale pacote" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "instale pacote" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "instale pacote" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "instale pacote" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "no verifique as dependncias do pacote" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "no execute nenhum estgio" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "instale pacote" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "instale pacote" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "instale pacote" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "instale pacote" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "assine um pacote (descarte a assinatura corrente)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "verifique a assinatura do pacote" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "assine um pacote (descarte a assinatura corrente)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "gere assinatura PGP" @@ -2329,7 +2349,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2380,32 +2400,32 @@ msgstr "no foi passado pacote para instalao" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Construo falhou.\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" # , c-format -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "Construo falhou.\n" @@ -2456,83 +2476,94 @@ msgstr "no foi passado pacote para instalao" msgid "can't query %s: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "Construo falhou.\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" # , c-format -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "No consegui abrir: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "pesquise todos os pacotes" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, fuzzy, c-format msgid "no package triggers %s\n" msgstr "no foram passados pacotes para assinatura" -#: lib/query.c:752 +# , c-format +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "No consegui ler o arquivo spec de %s\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "no foram passados pacotes para assinatura" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "no foi passado pacote para instalao" @@ -3162,84 +3193,84 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 #, fuzzy msgid "unexpected ]" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 #, fuzzy msgid "unexpected }" msgstr "fonte de pesquisa no esperado" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3313,7 +3344,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3328,88 +3359,88 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "no foi passado pacote para desinstalao" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "no foi passado pacote para instalao" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" # , c-format -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "No consegui abrir: %s\n" # , c-format -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" @@ -3422,163 +3453,163 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "RPM verso %s\n" # , c-format -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" # , c-format -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "No consegui abrir: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "no foi passado pacote para desinstalao" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" # , c-format #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 923d196..fd60367 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -73,353 +73,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -840,7 +840,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1451,48 +1451,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1542,37 +1542,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1829,182 +1829,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2087,7 +2103,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2135,31 +2151,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2207,81 +2223,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2864,82 +2890,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3006,7 +3032,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3021,242 +3047,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index b9fe9ad..743f7f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-08-29 13:55-0400\n" "Last-Translator: Eugene Kanter \n" "Language-Team: Black Cat Linux Team \n" @@ -75,257 +75,257 @@ msgstr " msgid "cannot re-open payload: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÜÔÏÊ ÐÒÇÒÁÍÍÙ" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "×Ù×ÏÄÉÔØ ÍÉÎÉÍÕÍ ÓÏÏÂÝÅÎÉÊ" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "×Ù×ÏÄÉÔØ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÓÏÏÂÝÅÎÉÑ" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "ÏÐÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁÞÅÎÉÅÍ <ÐÏÄÓÔÁÎÏ×ËÁ>" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "'<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>+" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "<ÉÍÑ>+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "<ËÏÍÁÎÄÁ>" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "<ËÁÔÁÌÏÇ>" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÍÁËÒÏÆÁÊÌÁ(Ï×) ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "<ÆÁÊÌ:...>" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ:...> ×ÍÅÓÔÏ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "ÚÁÐÒÅÔÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ libio(3) API" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "ÏÔÌÁÄËÁ ÐÒÏÔÏËÏÌÁ ÐÏÔÏËÁ ÄÁÎÎÙÈ" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "ÏÔÌÁÄËÁ ÐÒÏÃÅÓÓÁ ××ÏÄÁ/×Ù×ÏÄÁ rpmio" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "ÏÔÌÁÄËÁ ÏÂÒÁÂÏÔËÉ URL ËÜÛ" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "ðÁÒÁÍÅÔÒÙ ÚÁÐÒÏÓÁ (Ó -q ÉÌÉ --query):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "ðÁÒÁÍÅÔÒÙ ÐÒÏ×ÅÒËÉ (Ó -V ÉÌÉ --verify):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "ðÁÒÁÍÅÔÒÙ ÐÏÄÐÉÓÉ:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "ðÁÒÁÍÅÔÒÙ ÂÁÚÙ ÄÁÎÎÙÈ" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" "ðÁÒÁÍÅÔÒÙ ÓÂÏÒËÉ Ó [ <ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ> | <ÔÁÒ ÁÒÈÉ×> | <ÉÓÈÏÄÎÙÊ ÐÁËÅÔ> ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "ðÁÒÁÍÅÔÒÙ õÓÔÁÎÏ×ËÉ/ïÂÎÏ×ÌÅÎÉÑ/õÄÁÌÅÎÉÑ:" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "ïÂÝÉÅ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ×ÓÅÈ ÒÅÖÉÍÏ×:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM ×ÅÒÓÉÑ %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "üÔÕ ÐÒÏÇÒÁÍÍÕ ÍÏÖÎÏ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "×ÁÒÉÁÎÔ --rcfile ÂÏÌØÛÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "÷ÍÅÓÔÏ ÜÔÏÇÏ ÉÓÐÏÌØÚÕÊÔÅ \"--macros <ÆÁÊÌ:...>\".\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉÐ ÐÒÏ×ÅÒËÉ ÉÌÉ ÚÁÐÒÏÓÁ" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÆÌÁÇÉ ÚÁÐÒÏÓÁ" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "ÐÁÒÁÍÅÔÒ --dbpath ÚÁÄÁÎ ÄÌÑ ÏÐÅÒÁÃÉÉ, ÎÅ ÉÓÐÏÌØÚÕÀÝÅÊ ÂÁÚÕ ÄÁÎÎÙÈ" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "ÐÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× " "É ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ×ÁÒÉÁÎÔÏ× --prefix ÉÌÉ --relocate" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "×ÁÒÉÁÎÔÙ --relocate É --excludepath ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ " "ÎÏ×ÙÈ ÐÁËÅÔÏ×" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "×ÁÒÉÁÎÔ --prefix ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ÐÁËÅÔÏ×" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÐÁÒÁÍÅÔÒÏ× --excludedocs ÉÌÉ --" "includedocs" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" @@ -333,7 +333,7 @@ msgstr "" "ÐÁÒÁÍÅÔÒÙ ÚÁÐÒÅÔÁ ÓÃÅÎÁÒÉÅ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ " "ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" @@ -341,7 +341,7 @@ msgstr "" "ÐÁÒÁÍÅÔÒÙ ÚÁÐÒÅÔÁ ÔÒÉÇÇÅÒÏ× ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ " "ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ(Ï×)" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -349,14 +349,14 @@ msgstr "" "--nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÐÒÏ×ÅÒËÉ " "ÐÁËÅÔÏ×" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" "--test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ ÐÁËÅÔÁ" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -364,82 +364,82 @@ msgstr "" "--root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, ÚÁÐÒÏÓÁÈ " "ÐÁËÅÔÁ É ÐÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "ÎÅÔ ÆÁÊÌÏ× ÄÌÑ ÐÏÄÐÉÓÉ\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "ÎÅÔ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp ÎÅ ÎÁÊÄÅÎ: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "îÅ×ÅÒÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "ëÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÐÒÉÎÑÔÁ.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÏÄÐÉÓÉ" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ" @@ -834,7 +834,7 @@ msgstr " msgid "Could not open %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n" @@ -864,7 +864,7 @@ msgstr " msgid "Unable to write payload to %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "úÁÐÉÓÁÎ: %s\n" @@ -1493,23 +1493,23 @@ msgstr " msgid "YES" msgstr "äá" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1518,26 +1518,26 @@ msgstr "" "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, " "ÇÌÕÂÉÎÁ)\n" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "ãéëì:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(ÎÅ ÞÉÓÌÏ)" @@ -1590,37 +1590,37 @@ msgstr "========= msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "ËÁÔÁÌÏÇ %s ÓÏÚÄÁÎ Ó ÐÒÁ×ÁÍÉ ÄÏÓÔÕÐÁ %04o.\n" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "ÆÁÊÌ ÁÒÈÉ×Á %s ÎÅ ÎÁÊÄÅÎ × ÓÐÉÓËÅ ÆÁÊÌÏ× ÚÁÇÏÌÏ×ËÁ\n" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s ÓÏÈÒÁÎÅÎ ËÁË %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n" @@ -1887,191 +1887,211 @@ msgstr " msgid "upgrade package(s)" msgstr "ÏÂÎÏ×ÉÔØ ÐÁËÅÔ(Ù)" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ×ÓÅ ÐÁËÅÔÙ" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ × ÇÒÕÐÐÅ" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÆÁÊÌ ÐÁËÅÔÁ (Ô.Å. *.rpm ÆÁÊÌ Ä×ÏÉÞÎÏÇÏ ÐÁËÅÔÁ)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "ÒÅÖÉÍ ÚÁÐÒÏÓÁ rpm" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "ÏÔÏÂÒÁÚÉÔØ ÉÚ×ÅÓÔÎÙÅ ËÌÀÞÉ ÚÁÐÒÏÓÁ" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "ÚÁÐÒÏÓÉÔØ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "<ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ>" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ × ÇÒÕÐÐÅ" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓÃÅÎÁÒÉÑÍÉ ÎÁ ÐÁËÅÔ" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm (ÓÔÁÒÙÊ)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ËÏÎÆÉÇÕÒÁÃÉÉ" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "ÐÏËÁÚÁÔØ ÏÓÎÏ×ÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "ÐÏËÁÚÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%ghost" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%license" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ %%readme" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÉÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "ÚÁÍÅÎÉÔØ ÓÅËÃÉÉ i18n × ÆÁÊÌÅ ÓÐÅÃÉÆÉËÁÃÉÉ" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÅÒÅÞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "ÐÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ×" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÒÁÚÍÅÒ ÆÁÊÌÏ×" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÈÏÚÑÉÎÁ ÆÁÊÌÏ×" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÇÒÕÐÐÕ ÆÁÊÌÏ×" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ×ÒÅÍÑ ÍÏÄÉÆÉËÁÃÉÉ ÆÁÊÌÏ×" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÐÁËÅÔÁ" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ÐÁËÅÔÁ" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ %verifyscript (ÅÓÌÉ ÅÓÔØ)" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÐÕÔØ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ SHA1 ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ" @@ -2156,7 +2176,7 @@ msgid "is needed by" msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n" @@ -2204,31 +2224,31 @@ msgstr "%s: %s-%s-%s msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " ÎÁ ÆÁÊÌÅ " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n" @@ -2276,81 +2296,91 @@ msgstr " msgid "can't query %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "ÚÁÐÒÏÓ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "ÎÅÔ ÐÁËÅÔÏ×\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "ÆÁÊÌ %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2951,82 +2981,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\"" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\"" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)" @@ -3097,7 +3127,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "ÏÛÉÂËÁ(%d) ÐÒÉ ÐÏÄÓÞ£ÔÅ ÐÁËÅÔÏ×\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÅÔÓÑ.\n" @@ -3112,243 +3142,243 @@ msgstr "rpmdb: msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ÐÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ÐÁËÅÔÁ\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁÐÉÓÅÊ × ÉÎÄÅËÓ %s\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "ÕÄÁÌÑÅÔÓÑ %s ÐÏÓÌÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "ÐÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÞÅÒÅÚ dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %u)\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "====================== ÁËÔÉ×ÎÙÈ %d ÐÕÓÔÙÈ %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(ÐÕÓÔÏ)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(ÐÕÓÔÏ)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "îÅÚÁËÒÙÔÙÅ ÐÁÒÁÍÅÔÒÙ × ÍÁËÒÏÓÅ %%%s\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "íÁËÒÏÓ %%%s ÐÕÓÔ\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓÐÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ %c × %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏÐÕÓÔÉÍÏÊ(%d)\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "îÅÚÁËÒÙÔÁÑ %c: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "ÎÅÐÏÎÑÔÎÙÊ ÍÁËÒÏÓ ÐÏÓÌÅ %%\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ÐÒÏÐÕÓËÁÀ\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "æÁÊÌ %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ÞÅÍ %u ÂÁÊÔ\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "÷ÙÐÏÌÎÅÎÏ" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "æÁÊÌÏ×ÁÑ ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n" diff --git a/po/sk.po b/po/sk.po index 3577c3f..a6d2aae 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -74,273 +74,273 @@ msgstr "chyba pri msgid "cannot re-open payload: %s\n" msgstr "nie je mo¾né otvori» súbor %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "vypísa» verziu pou¾ívaného rpm" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "vypísa» verziu pou¾ívaného rpm" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "posla» ¹tandardný výstup do " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "pou¾i» ako adresár najvy¹¹ej úrovne" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 #, fuzzy msgid "Signature options:" msgstr "Veµkos» podpisu: %d\n" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "súbor %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM verzia %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 #, fuzzy msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "pou¾itie: rpm {--help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Namiesto nich pou¾ite -e alebo --erase.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "mô¾e by» pou¾itý iba jeden hlavný re¾im" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "naraz mô¾e by» vykonaný jeden typ otázky alebo overenia" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "neoèakávaný zdroj pre otázku" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "neoèakávaný zdroj pre otázku" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "neoèakávaný zdroj pre otázku" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "iba in¹talácia, aktualizácia a odstránenie zdrojov mô¾u by» vynútené" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate a --excludepath mô¾u by» pou¾ité iba poèas in¹talácie nových " "balíkov" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix mô¾e by» pou¾itý iba poèas in¹talácie nových balíkov" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumenty pre --prefix musia zaèína» znakom /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) mô¾e by» pou¾itý iba poèas in¹talácie balíka" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "mô¾e by» pou¾itá iba jedna voµba z --excludedocs a --includedocs" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches mô¾e by» pou¾ité iba poèas odstránenia balíkov" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles mô¾e by» pou¾ité iba poèas in¹talácie balíka" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -349,7 +349,7 @@ msgstr "" "--nodeps mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo overenia " "balíka" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" @@ -357,7 +357,7 @@ msgstr "" "--test mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo zostavenia " "balíka" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -365,82 +365,82 @@ msgstr "" "--root (-r) mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka, " "otázky alebo znovuzostavenia databázy" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argumenty pre --root (-r) musia zaèína» znakom /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "nie je mo¾né pracova» so súborom %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp nebolo nájdené: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Kontrola hesla zlyhala\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Heslo je v poriadku.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "vykonanie zlyhalo\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "neboli zadané ¾iadne balíky na podpis" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "neboli zadané ¾iadne balíky pre in¹taláciu" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "neboli zadané ¾iadne argumenty pre otázku" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "neboli zadané ¾iadne argumenty pre overenie" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "neoèakávané argumenty pre --querytags" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "neboli zadané ¾iadne argumenty pre otázku" @@ -850,7 +850,7 @@ msgstr "Nie je mo msgid "Could not open %s: %s\n" msgstr "Otvorenie %s zlyhalo\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" @@ -880,7 +880,7 @@ msgstr "Nie je mo msgid "Unable to write payload to %s: %s\n" msgstr "Nie je mo¾né zapísa» balík: %s" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapísané: %s\n" @@ -1517,48 +1517,48 @@ msgstr "NIE JE V PORIADKU" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstraòuje sa index skupín\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(nie je èíslo)" @@ -1610,37 +1610,37 @@ msgstr "" msgid "%10d %s\n" msgstr "riadok %d: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "varovanie: %s uchovaný ako %s" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "rmdir %s zlyhalo: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "varovanie: %s vytvorené ako %s" @@ -1915,211 +1915,231 @@ msgstr "nein msgid "upgrade package(s)" msgstr " --upgrade " -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "opýta» sa na v¹etky balíky" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im otázok" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "opýta» sa na balík vlastniaci " -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "opýta» sa na balík vlastniaci " + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "opýta» sa v¹etkých balíkov v skupine" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "opýta» sa na balík vlastniaci " + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "opýta» sa súboru balíka" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "opýta» sa na balík vlastniaci " + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "re¾im otázok" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "opýta» sa spec súboru" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "opýta» sa v¹etkých balíkov v skupine" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "opýta» sa balíkov spustených balíkom" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "re¾im otázok" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "re¾im otázok" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "opýta» sa na balíky vy¾adujúce schopnos» " -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "opýta» sa na balíky poskytujúce schopnos» " -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "zobrazi» v¹etky konfiguraèné súbory" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "zobrazi» v¹etky dokumentaèné súbory" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "zobrazi» základné informácie o balíku" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead zlyhalo\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "pou¾i» nasledovný formát otázky" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "zobrazii» stav daných súborov" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "zobrazi» podrobný zoznam súborov balíka" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "neoverova» závislosti balíka" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "nevykona» ¾iadne etapy" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "zobrazi» súbory v balíku" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "podpísa» balík (znièi» aktuálny podpis)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "overi» podpis balíka" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "podpísa» balík (znièi» aktuálny podpis)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "vytvori» PGP/GPG podpis" @@ -2205,7 +2225,7 @@ msgid "is needed by" msgstr " je vy¾adované %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Typ údajov %d nie je podorovaný\n" @@ -2255,31 +2275,31 @@ msgstr "bal msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s neexistuje - pou¾ije sa root" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalenie archívu zlyhalo%s%s: %s" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " pre súbor " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s zlyhalo" @@ -2328,82 +2348,92 @@ msgstr "bal msgid "can't query %s: %s\n" msgstr "zmazanie %s zlyhalo: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "otázka na %s zlyhala\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: readLead zlyhalo\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "nájdených %d balíkov\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s neobsahuje ¾iadne balíky\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "¾iadny z balíkov nespú¹»a %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Nie je mo¾né preèíta» %s: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "¾iadny z balíkov nespú¹»a %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "¾iadny z balíkov nevy¾aduje %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "¾iadny z balíkov neposkytuje %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "súbor %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "chybné èíslo balíku: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "po¾aduje sa záznam èíslo %d\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -3007,83 +3037,83 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "chýbajúce { po %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "chýbajúce } po %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "prázdny tag formát" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "prázdne meno tagu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "neznámy tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] oèakávané na konci poµa" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "neoèakávané ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "neoèakávané }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "? oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "{ oèakávané po ? vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "} oèakávané vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr ": oèakávané po ? podvýraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "{ oèakávané po : vo výraze" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "| oèakávené na konci výrazu" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(neznámy typ)" @@ -3156,7 +3186,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný" @@ -3171,246 +3201,246 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstraòuje sa index skupín\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstraòuje sa index názvov\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "chyba pri hµadaní balíka %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "premenováva sa %s na %s\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "nebola nastavená ¾iadna dbpath" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "znovu sa vytvára databáza v adresári %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "doèasná databáza %s u¾ existuje" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "otvára sa stará databáza\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "otvára sa nová databáza\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "nie je mo¾né prida» záznam pôvodne na %d" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradi» starú databázu novou!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradí súbory v %s súbormi z %s kvôli obnove" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "vytvára sa adresár %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstráni» adresár %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktívnych %d prázdnych %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prázdne)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prázdne)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s obsahuje neukonèené telo" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s obsahuje chybný názov (%%define)" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s obsahuje neukonèené voµby" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s obsahuje prázdne telo" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s sa nepodarilo expandova»" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s obsahuje chybný názov (%%undefine)" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d " -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznáma voµba %c v %s(%s)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Neukonèené %c: %s" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "balík %%%.*s nebol nájdený, vynecháva sa" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 #, fuzzy msgid "Target buffer overflow\n" msgstr "Preplnenie cieµovej vyrovnávacej pamäti" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Súbor %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Súbor %s je men¹í ako %d bajtov" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Úspech" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Chybná odpoveï servera" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "Chyba vstupu/výstupu servera" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Prekroèenie èasového limitu servera" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Nie je mo¾né vyhµada» adresu servera" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Nie je mo¾né vyhµada» názov servera" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Pripojenie k serveru zlyhalo" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Vytvorenie dátového spojenia k serveru zlyhalo" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "Chyba vstupu/výstupu lokálneho súboru" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Súbor sa na serveri nenachádza" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Zru¹enie prebieha" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Neznáma alebo neoèakávaná chyba" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prihlasuje sa na %s ako %s, heslo %s\n" diff --git a/po/sl.po b/po/sl.po index e8cda31..902fa22 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.224 2002/02/01 15:20:21 jbj Exp $ +# $Id: sl.po,v 1.225 2002/02/10 21:14:18 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -78,269 +78,269 @@ msgstr "napaka pri branju glave paketa\n" msgid "cannot re-open payload: %s\n" msgstr "ni mo¾no vnoviè odpreti (payload): %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "razlièica rpm, ki jo uporabljate" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "definirajte makro z vrednostjo " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "uporabljana razlièica rpm" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "standardni izhod preusmerjen na " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "uporabi za korenski imenik" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "prika¾i konèni rpmrc in nastavitev makra" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 #, fuzzy msgid "Signature options:" msgstr "Dol¾. podpisa : %d\n" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "datoteka %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM razlièica %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 #, fuzzy msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - Red Hat Software" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Ta program je dovoljeno razpeèevati pod pogoji navedenimi v GNU GPL." -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "Uporaba: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Namesto njiju uporabite -e ali --erase.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "izbran sme biti le en glavni naèin" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "samo en tip poizvedbe/preverjanja je mo¾en naenkrat" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "neprièakovane zastavice pri poizvedbi" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "neprièakovana oblika poizvedbe" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "neprièakovan izvor poizvedbe" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath podan, vendar, èeprav nepotreben" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "datoteke smemo premakniti samo med namestitvijo paketa" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix se sme uporabiti le pri namestitvi" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumenti izbire --prefix se morajo zaèeti z /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) sme biti podan le ob namestitvi paketa" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent sme biti podan le ob namestitvi paketa" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles sme biti podan le ob namestitvi paketa" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs sme biti podan le ob namestitvi paketa" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs sme biti podatn le ob namestitvi paketa" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs sme biti podan le ob namestitvi paketa" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuèujeta" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch sme biti podan le ob namestitvi paketa" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos sme podan le ob namestitvi paketa" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize sme biti podan le ob namestitvi paketa" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches sme biti podan le ob odstranitvi paketa" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles sme biti podati le ob namestitvi paketa" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -348,14 +348,14 @@ msgstr "" "--nodeps sme biti podan le ob izgradnji, vnovièni izgradnji, prevajanju, " "namestitvi, odstranitvi ali preverjanju paketa" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -363,82 +363,82 @@ msgstr "" "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali " "vnovièni izgradnji paketa" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argumenti izbire --root (-r) se morajo zaèeti z /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "ni datotek, ki bi jih lahko podpisal\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "dostop do datoteke %s ni mo¾en\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp manjka: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Vnesite pristopno geslo: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Preverjanje pristopnega gesla neuspe¹no\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Pristopno geslo je pravo.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Neveljaven %%_signature v makro-datoteki.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign sme biti podan le ob izgradnji paketa" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "izvajanje je bilo neuspe¹no\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "paketi za vnovièno izgradnjo niso navedeni" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "datoteka spec za izgradnjo manjka" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "arhiv tar za izgradnjo manjka" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "paketi katere bi bilo potrebno podpisati niso navedeni" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "paketi katere bi bilo potrebno namestiti niso navedeni" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "argumenti za poizvedbo niso podani" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "argumenti za preverjanje niso podani" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "neprièakovani argumenti za --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "argumenti za poizvedbo niso podani" @@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo msgid "Could not open %s: %s\n" msgstr "Ni mo¾no odpreti %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ni mo¾no zapisati paketa: %s" @@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo msgid "Unable to write payload to %s: %s\n" msgstr "Ni mo¾no zapisati paketa %s: %s" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Zapisano: %s\n" @@ -1518,48 +1518,48 @@ msgstr "NI DOBRO" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "odstranjujemo seznam skupin\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(ni ¹tevilo)" @@ -1611,37 +1611,37 @@ msgstr "" msgid "%10d %s\n" msgstr "vrstica %d: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "opozorilo: %s shranjen kot %s" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ni mo¾no odstraniti %s - imenik ni prazen" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "odstranitev imenika %s je bila neuspe¹na: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "opozorilo: %s ustvarjen kot %s" @@ -1915,209 +1915,229 @@ msgstr "ne namesti, a ugotovi, msgid "upgrade package(s)" msgstr " --upgrade " -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "poizvedba/preverba po vseh paketih" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "poizvedba po paketu, ki vsebuje " -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "poizvedba po paketu, ki vsebuje " + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "poizvedba po paketu v skupini" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "poizvedba po paketu, ki vsebuje " + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "poizvedba po paketu" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "poizvedba po paketu, ki vsebuje " + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "prika¾i znane znaèke za poizvedovanje" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "poizvedba po datoteki spec" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "poizvedba po paketu v skupini" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "poizvedba po paketih, ki jih spro¾i paket" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "poizvedbeni naèin" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "poizvedbeni naèin (opu¹èen)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost " -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost " -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "izpis vseh nastavitvene datoteke" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "izpis vseh dokumentacijske datoteke" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "iznos osnovnih podatkov o datoteki" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "izpis seznama datotek v paketu" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: readLead je bil neuspe¹en\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "uporabi naslednjo obliko poizvedbe" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "zamenjava razdeljkov I18N z naslednjim katalogom" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "izpis stanja seznama datotek" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "izpis ob¹irnega seznama datotek" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "brez preverjanja soodvisnosti paketa" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "brez izvajanja katerekoli stopen izgradnje" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "brez preverjanja datotek v paketu" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "preveri podpis paketa(-ov)" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "izdelava podpisa PGP/GPG" @@ -2204,7 +2224,7 @@ msgid "is needed by" msgstr " potrebuje %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Tip podatkov %d ni podprt\n" @@ -2254,31 +2274,31 @@ msgstr "paket: %s-%s-%s datoteke test = %d\n" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, fuzzy, c-format msgid "user %s does not exist - using root\n" msgstr "uporabnik %s ne obstaja - uporabljam root" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "skupina %s ne obstaja - uporabljam root" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " za datoteko " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspe¹no odpiranje %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s neuspe¹en" @@ -2327,82 +2347,92 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id" msgid "can't query %s: %s\n" msgstr "ni mo¾no poizvedeti o %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "odpiranje %s je bilo neuspe¹no: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "poizvedba po %s je bila neuspe¹na\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: branje Fread je bilo neuspe¹no: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "ni paketov\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "skupina %s ne vsebuje nobenega paketa\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "noben paket ne pro¾i %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Neuspe¹no branje %s: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "noben paket ne pro¾i %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "noben paket ne potrebuje %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "noben paket ne nudi %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "datoteka %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ni del nobenega paketa\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "neveljavna ¹tevilka paketa: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "¹tevilka zapisa paketa: %d\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "zapisa %d ni mo¾no prebrati\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "paket %s ni name¹èen\n" @@ -3009,83 +3039,83 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 #, fuzzy msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "manjkajoèi { za %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "manjkajoèi } za %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "oblika znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "ime znaèke manjka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "neznana znaèka" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "na koncu polja je prièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "neprièakovan ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "neprièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "v izrazu je prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "v izrazu je za { prièakovan ?" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "v izrazu je prièakovan }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "za podizrazom ? je prièakovano :" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "v izrazu je za : prièakovan {" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "na koncu izraza je prièakovan |" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(neznan tip)" @@ -3157,7 +3187,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "napaka(%d) pri ¹tetju paketov" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno." @@ -3172,248 +3202,248 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ni mo¾no prebrati glave pri 0x%x" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "odstranjevanje \"%s\" iz kazala %s.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "odstranjevanje %d vnosov iz kazala %s\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "napaka(%d) pri iskanju paketa %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, fuzzy, c-format msgid "adding \"%s\" to %s index.\n" msgstr "dodajanje \"%s\" v kazalo %s.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "dodajanje %d vnosov v kazalo %s.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "zaèasna podatkovna zbirka %s ¾e obstaja" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "ustvarjanje imenika: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "odpiranje stare podatkovne zbirke\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "zapisa ni mo¾no dodati na %d" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 #, fuzzy msgid "failed to rebuild database: original database remains in place\n" msgstr "" "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n" "istem mestu\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, fuzzy, c-format msgid "replace files in %s with files from %s to recover" msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "odstranjevanje imenika: %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspe¹na odstranitev imenika %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktivni %d prazni %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(prazni)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(prazni)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, fuzzy, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s vsebuje nezakljuèeno telo" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, fuzzy, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s vsebuje nezakljuèene izbire" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, fuzzy, c-format msgid "Macro %%%s has empty body\n" msgstr "Makro %%%s vsebuje prazno telo" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, fuzzy, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s se ne raz¹iri" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, fuzzy, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, fuzzy, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Neznana izbira %c v %s(%s)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, fuzzy, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Nezakljuèeni %c: %s" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, fuzzy, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Oznaki %% sledi nerazèlenljiv makro" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Makro %%%.*s ni najden - preskoèeno" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 #, fuzzy msgid "Target buffer overflow\n" msgstr "Ciljni medpomnilnik je bil prekoraèen" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "Datoteka %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, fuzzy, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Datoteka %s je kraj¹a od %d bajtov" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Uspeh" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Nepravilen odziv stre¾nika" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "V/I napaka na stre¾niku" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Èas odziva stre¾nika je potekel" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Naslov stre¾nika ni ugotovljiv" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Ime stre¾nika ni bilo ugotovljivo" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "V/I napaka na lokalni datoteki" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Datoteke ni mo¾no najti na stre¾niku" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Prekinitev v teku" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Neznana ali neprièakovana napaka" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prijava na %s kot %s, geslo %s\n" diff --git a/po/sr.po b/po/sr.po index f9b9e78..f932d9a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -71,271 +71,271 @@ msgstr "gre msgid "cannot re-open payload: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "napi¹i verziju rpm-a koja se koristi" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 #, fuzzy msgid "print macro expansion of +" msgstr "napi¹i verziju rpm-a koja se koristi" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "po¹alji standardni izlaz u " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "koristi kao direktorijum najvi¹eg nivoa" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, fuzzy, c-format msgid "%s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM verzija %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 #, fuzzy msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, fuzzy, c-format msgid "Usage: %s {--help}\n" msgstr "kori¹æenje: {rpm --help}" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 #, fuzzy msgid "Use \"--macros \" instead.\n" msgstr "Koristite -e ili --erase.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "samo jedan glavni re¾im mo¾e biti naveden" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "samo jedan tip upita/provere mo¾e biti uraðen odjednom" -#: rpmqv.c:670 +#: rpmqv.c:674 #, fuzzy msgid "unexpected query flags" msgstr "neoèekivan izvor upita" -#: rpmqv.c:673 +#: rpmqv.c:677 #, fuzzy msgid "unexpected query format" msgstr "neoèekivan izvor upita" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "neoèekivan izvor upita" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka" -#: rpmqv.c:723 +#: rpmqv.c:727 #, fuzzy msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "samo instalacija i a¾uriranje mogu biti forsirane" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate" -#: rpmqv.c:731 +#: rpmqv.c:735 #, fuzzy msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "--relocate mo¾ete koristiti samo kad instalirate novi paket" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argumenti za --prefix moraju poèeti znakom /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:778 +#: rpmqv.c:782 #, fuzzy msgid "--ignoresize may only be specified during package installation" msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa" -#: rpmqv.c:796 +#: rpmqv.c:800 #, fuzzy msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa" -#: rpmqv.c:801 +#: rpmqv.c:805 #, fuzzy msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa" -#: rpmqv.c:805 +#: rpmqv.c:809 #, fuzzy msgid "" "--nodeps may only be specified during package building, rebuilding, " @@ -343,14 +343,14 @@ msgid "" msgstr "" "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -358,84 +358,84 @@ msgstr "" "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili " "rekreiranja baze podataka" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argumenti za --root (-r) moraju poèeti znakom /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, fuzzy, c-format msgid "cannot access file %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmqv.c:875 +#: rpmqv.c:879 #, fuzzy msgid "pgp not found: " msgstr "Datoteka nije pronaðena na serveru" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Neuspela provera lozinke\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Lozinka je dobra.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa" -#: rpmqv.c:915 +#: rpmqv.c:919 #, fuzzy msgid "exec failed\n" msgstr "%s: Neuspelo otvaranje\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "nedosataje paket za rekreiranje" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "nedostaje specifikacije za kreiranje" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "nedostaju 'tar' datoteke za kreiranje" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "nedostaje paket za potpisivanje" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "nedostaje paket za instalaciju" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "nedostaju argumenti za upit" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "nedostaju argumenti za proveru" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "neoèekivani argumenti za --querytags" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "nedostaju argumenti za upit" @@ -837,7 +837,7 @@ msgstr "Ne mogu da upi msgid "Could not open %s: %s\n" msgstr "neuspelo otvaranje %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, fuzzy, c-format msgid "Unable to write package: %s\n" msgstr "Ne mogu da upi¹em %s" @@ -867,7 +867,7 @@ msgstr "Ne mogu da upi msgid "Unable to write payload to %s: %s\n" msgstr "Ne mogu da upi¹em %s" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1505,48 +1505,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(nije broj)" @@ -1598,37 +1598,37 @@ msgstr "" msgid "%10d %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, fuzzy, c-format msgid "%s saved as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, fuzzy, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "ne mogu da uklonim %s - direktorijum nije prazan" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, fuzzy, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "neuspela komanda rmdir %s: %s" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, fuzzy, c-format msgid "%s unlink of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, fuzzy, c-format msgid "%s created as %s\n" msgstr "Ne mogu da otvorim datoteku %s: " @@ -1902,217 +1902,237 @@ msgstr "nemoj instalirati, ali reci da li msgid "upgrade package(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 #, fuzzy msgid "query/verify all packages" msgstr "upit nad svim paketima" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "re¾im upita" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 #, fuzzy msgid "query/verify package(s) owning file" msgstr "upit nad paketom koji ima " -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "upit nad paketom koji ima " + +#: lib/poptQV.c:103 #, fuzzy msgid "query/verify package(s) in group" msgstr "paket nema imena" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "upit nad paketom koji ima " + +#: lib/poptQV.c:107 #, fuzzy msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "upit nad svim paketima" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "upit nad paketom koji ima " + +#: lib/poptQV.c:111 #, fuzzy msgid "rpm query mode" msgstr "re¾im upita" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 #, fuzzy msgid "query a spec file" msgstr "upit nad %s neuspeo\n" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "paket nema imena" + +#: lib/poptQV.c:121 #, fuzzy msgid "query the package(s) triggered by the package" msgstr "upit nad paketom koji ima " -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 #, fuzzy msgid "rpm verify mode" msgstr "re¾im upita" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 #, fuzzy msgid "rpm verify mode (legacy)" msgstr "re¾im upita" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 #, fuzzy msgid "query/verify the package(s) which require a dependency" msgstr "upit za pakete koji zahtevaju svojstvo" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 #, fuzzy msgid "query/verify the package(s) which provide a dependency" msgstr "upit za pakete koji omoguæavaju svojstvo" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 #, fuzzy msgid "list all configuration files" msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 #, fuzzy msgid "list all documentation files" msgstr "instaliraj dokumentaciju" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 #, fuzzy msgid "dump basic file information" msgstr "prika¾i informacije o paketu" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 #, fuzzy msgid "list files in package" msgstr "instaliraj paket" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, fuzzy, c-format msgid "skip %%readme files" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 #, fuzzy msgid "use the following query format" msgstr "neoèekivan izvor upita" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 #, fuzzy msgid "substitute i18n sections into spec file" msgstr "upit nad paketom koji ima " -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 #, fuzzy msgid "display a verbose file listing" msgstr "prika¾i listu datoteka u paketu" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 #, fuzzy msgid "don't verify MD5 digest of files" msgstr "instaliraj paket" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 #, fuzzy msgid "don't verify size of files" msgstr "instaliraj paket" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 #, fuzzy msgid "don't verify symlink path of files" msgstr "instaliraj paket" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 #, fuzzy msgid "don't verify owner of files" msgstr "instaliraj paket" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 #, fuzzy msgid "don't verify group of files" msgstr "instaliraj paket" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 #, fuzzy msgid "don't verify mode of files" msgstr "instaliraj paket" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 #, fuzzy msgid "don't verify files in package" msgstr "instaliraj paket" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 #, fuzzy msgid "don't verify package dependencies" msgstr "nemoj proveravati zavisnosti paketa" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "nemoj izvr¹iti nijednu fazu" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "instaliraj paket" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "potpi¹i paket (ukloni tekuæi potpis)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "proveri potpis u paketu" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "potpi¹i paket (ukloni tekuæi potpis)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 #, fuzzy msgid "generate signature" msgstr "napravi PGP potpis" @@ -2198,7 +2218,7 @@ msgid "is needed by" msgstr " je potreban paketu %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2247,31 +2267,31 @@ msgstr "paket %s-%s-%s sadr msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, fuzzy, c-format msgid "group %s does not exist - using root\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, fuzzy, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "PGP omanuo" @@ -2321,82 +2341,92 @@ msgstr "paket nema imena" msgid "can't query %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, fuzzy, c-format msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: Neuspeo 'readLead'\n" -#: lib/query.c:691 +#: lib/query.c:709 #, fuzzy, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "upit nad %s neuspeo\n" -#: lib/query.c:712 +#: lib/query.c:730 #, fuzzy msgid "no packages\n" msgstr "upit nad svim paketima" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "nijedan paket ne aktivira %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Neuspelo èitanje %s: %s." + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "nijedan paket ne aktivira %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "nijedan paket ne zahteva %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "nijedan paket ne obezbeðuje %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, fuzzy, c-format msgid "file %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "datoteka %s ne pripada nijednom paketu\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, fuzzy, c-format msgid "package record number: %u\n" msgstr "pogre¹an broj paketa: %s\n" -#: lib/query.c:837 +#: lib/query.c:945 #, fuzzy, c-format msgid "record %u could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2997,84 +3027,84 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "nedostaje { posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "nedostaje } posle %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "prazan 'tag' format'" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "prazno ime tag-a" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "nepoznat tag" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] oèekivano na kraju niza" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "neoèekivano ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "neoèekivano }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "oèekivan znak ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 #, fuzzy msgid "{ expected after ? in expression" msgstr "{ oèekivano posle ? u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "} oèekivano u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "oèekivano : praæeno ? podizrazom" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 #, fuzzy msgid "{ expected after : in expression" msgstr "{ oèekivano posle : u izrazu" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "| oèekivano na kraju izraza" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(nepoznat tip)" @@ -3144,7 +3174,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, fuzzy, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga" @@ -3159,251 +3189,251 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "ne mogu da proèitam zaglavlje na %d za proveru" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, fuzzy, c-format msgid "removing \"%s\" from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, fuzzy, c-format msgid "removing %d entries from %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, fuzzy, c-format msgid "error(%d) allocating new package instance\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, fuzzy, c-format msgid "adding %d entries to %s index.\n" msgstr "gre¹ka uklanjanja sloga %s u %s" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "dbpath nije odreðen" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, fuzzy, c-format msgid "rebuilding database %s into %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, fuzzy, c-format msgid "temporary database %s already exists\n" msgstr "privremena baza podataka %s veæ postoji" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, fuzzy, c-format msgid "creating directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, fuzzy, c-format msgid "creating directory %s: %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, fuzzy, c-format msgid "opening old database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, fuzzy, c-format msgid "opening new database with dbapi %d\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, fuzzy, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog originalno na %d" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, fuzzy, c-format msgid "removing directory %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, fuzzy, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, fuzzy, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "(nepoznat tip)" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, fuzzy, c-format msgid "Unterminated %c: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, fuzzy, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "paket %s nije naðen u %s" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, fuzzy, c-format msgid "File %s: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 #, fuzzy msgid "Bad server response" msgstr "Lo¹ odgovor FTP servera" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 #, fuzzy msgid "Server I/O error" msgstr "Ulazno/izlazna FTP gre¹ka" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 #, fuzzy msgid "Server timeout" msgstr "Tajm-aut FTP servera" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 #, fuzzy msgid "Unable to lookup server host address" msgstr "Ne mogu da odredim host adresu FTP servera" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 #, fuzzy msgid "Unable to lookup server host name" msgstr "Ne mogu da odredim ime FTP hosta" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 #, fuzzy msgid "Failed to connect to server" msgstr "Ne mogu da se pove¾em sa FTP serverom" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 #, fuzzy msgid "Failed to establish data connection to server" msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 #, fuzzy msgid "I/O error to local file" msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Datoteka nije pronaðena na serveru" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 #, fuzzy msgid "Unknown or unexpected error" msgstr "Neoèekivana ili nepoznata FTP gre¹ka" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 57601a3..c3df980 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-09-12 14:18+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -73,251 +73,251 @@ msgstr "fel vid l msgid "cannot re-open payload: %s\n" msgstr "kan inte återöppna lasten: %s\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "visa vilken version av rpm som används" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "visa mindre detaljerad utdata" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "visa mer detaljerad utdata" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "definiera makrot som " -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "skriv ut makroexpansion av +" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "skicka standard ut till " -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "använd som toppkatalog" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "läs istället för standardmakrofil(er)" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "läs istället för standard rpmrc-fil(er)" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "visa slutliga rpmrc- och makrokonfigurationer" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "deaktivera användningen av libio(3)-API:et" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "felsök protokolldataström" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "felsök rpmio I/O" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "felsök cache-hanteringen av URL:ar" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "Frågeflaggor (med -q eller --query):" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "Verifieringsflaggor (med -V eller --verify):" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "Signaturflaggor:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "Databasflaggor:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "Byggflaggor med [ | | ]:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "Installera-/Uppdatera-/Raderaflaggor" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "Gemensamma flaggor för alla rpm-lägen:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "%s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM version %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright © 1998-2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Det här programmet kan distribueras fritt enligt villkoren i GNU GPL" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Användning: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "Flaggan --rcfile har tagits bort.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Använd \"--macros \" istället.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "Internt fel i argumenthantering (%d) :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "enbart ett huvudläge kan anges" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "endast en typ av fråga/verifiering kan utföras åt gången" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "oväntade frågeflaggor" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "oväntat frågeformat" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "oväntad frågekälla" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath angivet för en operation som inte använder någon databas" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "filer kan relokeras endast under paketinstallation" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "enbart en av --prefix eller --relocate kan användas" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate och --excludepath kan endast användas när nya paket installeras" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix kan endast användas när nya paket installeras" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "argument till --prefix måste börja med /" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) kan enbart användas vid paketinstallation" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent kan enbart användas vid paketinstallation" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles kan enbart användas vid paketinstallation" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs kan enbart användas vid paketinstallation" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs kan enbart användas vid paketinstallation" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs kan enbart användas vid paketinstallation" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "enbart en av --excludedocs och --includedocs kan användas" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch kan enbart användas vid paketinstallation" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos kan enbart användas vid paketinstallation" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize kan enbart användas vid paketinstallation" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches kan enbart användas när paket raderas" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles kan enbart användas vid paketinstallation" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "--justdb kan enbart användas när paket installeras eller raderas" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" @@ -325,7 +325,7 @@ msgstr "" "skriptdeaktiveringsflaggor kan enbart användas när paket installeras eller " "raderas" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" @@ -333,7 +333,7 @@ msgstr "" "utlösardeaktiveringsflaggor kan enbart användas när paket installeras eller " "raderas" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -341,13 +341,13 @@ msgstr "" "--nodeps kan enbart användas när paket byggs, byggs om, kompileras om, " "installeras, raderas eller verifieras" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "--test kan enbart användas när paket installeras, raderas eller byggs" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -355,82 +355,82 @@ msgstr "" "--root (-r) kan enbart användas när paket installeras, raderas, frågas eller " "databasen byggs om" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "argument till --root (-r) måste börja med /" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "inga filer att signera\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "kan inte komma åt filen %s\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp hittades inte: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Ange lösenfras: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Kontrollen av lösenfrasen misslyckades\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Lösenfrasen är ok.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Felaktig %%_signature-spec i makrofil.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign kan enbart användas vid pakettillverkning" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "exec misslyckades\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "inga paketfiler angivna för omtillverkning" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "inga specfiler angivna för tillverkning" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "inga tar-filer angivna för tillverkning" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "inga paket angivna för signering" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "inga paket angivna för installation" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "inga parametrar angivna för fråga" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "inga parametrar angivna för verifiering" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "oväntade argument till --querytags " -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "inga parametrar angivna för fråga" @@ -825,7 +825,7 @@ msgstr "Kan inte l msgid "Could not open %s: %s\n" msgstr "Kunde inte öppna %s: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "Kunde inte skriva paket: %s\n" @@ -855,7 +855,7 @@ msgstr "Kan inte l msgid "Unable to write payload to %s: %s\n" msgstr "Kan inte skriva last till %s: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Skrev: %s\n" @@ -1478,23 +1478,23 @@ msgstr "NEJ " msgid "YES" msgstr "JA" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== noterar alla relationer\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1502,26 +1502,26 @@ msgid "" msgstr "" "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== endast efterföljare (presentationsordning)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "LOOP:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== fortsätter med tsort ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(inte ett tal)" @@ -1574,37 +1574,37 @@ msgstr "========= Kataloger ej uttryckligen inkluderade i paketet:\n" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "katalog %s skapad med rättigheter %04o.\n" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "arkivfil %s fanns inte i huvudets fillista\n" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s rmdir av %s misslyckades: Katalogen är inte tom\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s rmdir av %s misslyckades: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s unlink av %s misslyckades: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" @@ -1870,191 +1870,211 @@ msgstr "installera inte, men tala om ifall det skulle fungera eller inte" msgid "upgrade package(s)" msgstr "uppgradera paket" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "fråga/verifiera alla paket" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "rpm verifieringsläge" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "fråga/verifiera paket som äger fil" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "fråga/verifiera paket som äger fil" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "fråga/verifiera paket i grupp" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "fråga/verifiera paket som äger fil" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "fråga/verifiera en paketfil (t.ex. en binär *.rpm-fil)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "fråga/verifiera paket som äger fil" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "rpm frågeläge" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "visa kända frågetaggar" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "fråga en specfil" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "fråga/verifiera paket i grupp" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "fråga paket utlösta av paketet" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "rpm verifieringsläge" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "rpm verifieringsläge (ärvt)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "fråga/verifiera paket som behöver ett beroende" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "fråga/verifiera paket som tillhandahåller ett beroende" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "lista alla konfigurationsfiler" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "lista alla dokumentationsfiler" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "visa filinformation" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "lista filer i paketet" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "hoppa över %%ghost-filer" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "hoppa över %%license-filer" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "hoppa över %%readme-filer" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "använd följande frågeformat" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "ersätt översatta sektioner till specfil" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "visa tillstånd för de listade filerna" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "visa en utförlig fillistning" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "verifiera inte MD5-summor för filer" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "verifiera inte storlekar på filer" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "verifiera inte sökvägen i symboliska länkar" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "verifiera inte ägare till filer" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "verifiera inte grupper till filer" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "verifiera inte modifikationstiden för filer" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "verifiera inte rättigheter för filer" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "verifiera inte filerna i paketet" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "verifiera inte paketberoenden" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "utför inte (eventuellt) %verifyscript" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "verifiera inte MD5-summor för filer" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "verifiera inte sökvägen i symboliska länkar" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "verifiera inte huvudets SHA1-summa" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "verifiera inte MD5-summor för filer" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "signera ett paket (släng nuvarande signatur)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "verifiera paketsignatur" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "signera ett paket (släng nuvarande signatur)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "generera signatur" @@ -2139,7 +2159,7 @@ msgid "is needed by" msgstr " behövs av %s-%s-%s\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "Datatyp %d stöds inte\n" @@ -2188,31 +2208,31 @@ msgstr "%s: %s-%s-%s har %d filer, test = %d\n" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "användare %s finns inte - använder root\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "grupp %s finns inte - använder root\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " vid fil " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "%s misslyckades på fil %s: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "%s misslyckades: %s\n" @@ -2260,81 +2280,91 @@ msgstr "paketet har varken fil msgid "can't query %s: %s\n" msgstr "kan inte fråga %s: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "misslyckades med att öppna %s: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "fråga av %s misslyckades\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "källpaket i gammalt format går inte att fråga om\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: läsning av paketlista misslyckades: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "fråga av specfil %s misslyckades, kan inte tolka\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "inga paket\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "grupp %s innehåller inga paket\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "inga paketutlösare %s\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "Misslyckades med att läsa %s: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "inga paketutlösare %s\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "inget paket behöver %s\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "inget paket tillhandahåller %s\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "fil %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "filen %s tillhör inget paket\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "felaktigt paketnummer: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "paketpost nummer: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "post %u kunde inte läsas\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "paket %s är inte installerat\n" @@ -2934,82 +2964,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "{ fattas efter %" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "} fattas efter %{" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "tomt taggformat" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "tomt taggnamn" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "okänd tagg" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "] förväntades vid slutet på vektor" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "oväntad ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "oväntad }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "? förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "{ förväntades efter ? i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "} förväntades i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr ": förväntades efter ? i deluttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "{ förväntades efter : i uttryck" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "| förväntades vid slutet på uttryck" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(okänd typ)" @@ -3078,7 +3108,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "fel(%d) när paket räknades\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n" @@ -3093,242 +3123,242 @@ msgstr "rpmdb: skadad huvudinstans #%u h msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "tar bort \"%s\" från %s-indexet.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "tar bort %d poster från %s-indexet.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "fel(%d) vid allokering av ny paketinstans\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "lägger till \"%s\" till %s-indexet.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "lägger till %d poster till %s-indexet.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "tar bort %s efter lyckad db3-ombyggnad.\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "bygger om databas %s till %s\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "tillfällig databas %s existerar redan\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "skapar katalog %s\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "skapar katalog %s: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "öppnar gammal databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "öppnar ny databas med dbapi %d\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "tar bort katalog %s\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== aktiva %d tomma %d\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(tom)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(tom)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "Makro %%%s har oavslutad kropp\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "Makro %%%s har otillåtet namn (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "Makro %%%s har oavslutade flaggor\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "makro %%%s har tom kropp\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "Makro %%%s misslyckades att expandera\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "Makro %%%s har otillåtet namn (%%undefine)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "Makro %%%s (%s) användes inte under nivå %d\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "Okänd flagga %c i %s(%s)\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Rekursionsdjup(%d) större än max(%d)\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "Oavslutad %c: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Ett %% följs av ett makro som inte kan tolkas\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "Inget makro %%%.*s hittat, hoppar över\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Målbuffert översvämmad\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "Fil %s: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "Filen %s är mindre än %u byte\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Lyckades" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Konstigt svar från server" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "IO-fel mot server" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Förbindelsen med servern dog ut (timeout)" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Kunde inte slå upp serverns adress" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Kunde inte slå upp serverns namn" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Misslyckades med att kontakta servern" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Misslyckades med att etablera en dataförbindelse till servern" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "I/O-fel mot lokal fil" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Fel när fjärrservern sattes i passivt läge" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Filen fanns inte på servern" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Avbruten under gång" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Okänt eller oväntat fel" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "loggar in på %s som %s, lösenord %s\n" diff --git a/po/tr.po b/po/tr.po index 5de4871..a1282c2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -74,255 +74,255 @@ msgstr "paketten ba msgid "cannot re-open payload: %s\n" msgstr "payload %s tekrar açýlamýyor\n" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "Kullanýlan RPM sürümünü verir" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "daha az ayrýntýlý çýktý saðlar" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "daha ayrýntýlý çýktý saðlar" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr " makrosunu deðeriyle tanýmlar" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "' '" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "+ için makro açýlýmýný gösterir" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "+" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "standart çýktýyý 'a gönderir" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "Üst düzey dizin olarak kullanýlýr" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "öntanýmlý makro dosyasý yerine okunur" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "öntanýmlý rpmrc dosyasý yerine okunur" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "libio(3) API kullanýmýný iptal eder" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "protokol veri akýþýnda hata kontrolu" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "rpmio G/Ç hata kontrolu" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "URL arabellek kullanýmý hata kontrolu" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "Sorgulama seçenekleri (-q ya da --query ile)" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "Denetleme seçenekleri (-V ya da --verify ile)" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "Ýmza seçenekleri:" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "Veritabaný seçenekleri:" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" "[ | | ] ile paketleme seçenekleri:" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "Kurma/Güncelleme/Kaldýrma seçenekleri:" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "Tüm rpm kipleri için ortak seçenekler:" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "dosya %s: %s\n" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "RPM Sürüm %s\n" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc." -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "Bu program GNU GPL koþullarýna uygun olarak serbestçe daðýtýlabilir." -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "Kullanýmý: %s {--help}\n" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "--rcfile seçeneði kaldýrýlmýþtý.\n" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "Yerine \"--macros \" kullanýn.\n" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "(%d) argümaný iþlenirken iç hata oluþtu :-(\n" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "sadece bir ana kip belirtilebilir" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "bir anda sadece bir tarz sorgulama/denetleme yapýlabilir" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "beklenmeyen sorgulama bayraklarý" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "beklenmeyen sorgulama biçemi" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "beklenmeyen sorgulama kaynaðý" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "--dbpath bir veritabaný kullanmayan iþlemler için verilmiþ" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" "sadece kaynak ve spec silme iþlemleri, kurma, güncelleme iþlemleri için " "zorlanabilir" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" "dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleþtirilebilir" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" "--relocate ve --excludepath sadece yeni paket kurulumunda kullanýlabilir" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "--prefix sadece yeni paketlerin kurulmasý sýrasýnda kullanýlabilir" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "--prefix ile belirtilenler '/' ile baþlamalý" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "--hash (-h) sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "--percent sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "--replacepkgs sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "--excludedocs sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "--includedocs sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "--excludedocs ve --includedocs bir arada kullanýlamaz" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "--ignorearch sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "--ignoreos sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "--ignoresize sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "--allmatches sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "--allfiles sadece paket kurulumu sýrasýnda kullanýlabilir" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" "--justdb sadece paket kurulumu ve kaldýrýlmasý sýrasýnda kullanýlabilir" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" @@ -330,7 +330,7 @@ msgstr "" "betik iptal etme seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda " "kullanýlabilir" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" @@ -338,7 +338,7 @@ msgstr "" "tetikleme iptal seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda " "kullanýlabilir" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" @@ -346,7 +346,7 @@ msgstr "" "--nodeps sadece paket oluþturma, yeniden oluþturma, yeniden derleme, " "kurulum, kaldýrma ve denetleme iþlemlerinde kullanýlabilir" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" @@ -354,7 +354,7 @@ msgstr "" "--test sadece paket kurulumu, kaldýrýlmasý ve oluþturulmasý iþlemlerinde " "kullanýlabilir" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" @@ -362,82 +362,82 @@ msgstr "" "--root (-r) sadece kurulum, kaldýrma, sorgulama ve yeniden veritabaný " "oluþturma iþlemlerinde kullanýlabilir" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "--root (-r) ile verilenler '/' ile baþlamalý" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "imzalanacak dosya yok\n" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "%s dosyasý bulunamýyor\n" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "pgp bulunamadý: " -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "Anahtar parolasýný girin: " -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "Anahtar parolasý kontrolü baþarýsýz\n" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "Anahtar parolasý doðru.\n" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "Makro dosyasýndaki %%_signature spec geçersiz.\n" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "--sign sadece paket oluþturulurken kullanýlabilir" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "icra baþarýsýz\n" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "yeniden oluþturmak için paket dosyalarý belirtilmemiþ" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "oluþturma için gerekli spec dosyasý belirtilmemiþ" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ" -#: rpmqv.c:1036 +#: rpmqv.c:1043 #, fuzzy msgid "no packages given for erase" msgstr "imzalanacak paket(ler) belirtilmedi" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "yüklenecek paket(ler) belirtilmedi" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "sorgulama için hiç argüman belirtilmedi" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "denetleme için hiç argüman belirtilmedi" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "--querytags ile beklenmeyen girdiler" -#: rpmqv.c:1130 +#: rpmqv.c:1140 #, fuzzy msgid "no arguments given" msgstr "sorgulama için hiç argüman belirtilmedi" @@ -836,7 +836,7 @@ msgstr "%s'den ba msgid "Could not open %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "paket yazýlamadý: %s\n" @@ -866,7 +866,7 @@ msgstr "%s'den payload okunamad msgid "Unable to write payload to %s: %s\n" msgstr "%s'e payload yazýlamadý: %s\n" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "Yazýldý: %s\n" @@ -1498,23 +1498,23 @@ msgstr "HAYIR " msgid "YES" msgstr "EVET" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, fuzzy, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "========== tsort baðýntýlarý kaydediliyor\n" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 #, fuzzy msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " @@ -1522,26 +1522,26 @@ msgid "" msgstr "" "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "========== sadece ardýllar (sunum sýrasý)\n" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "ÇEVRÝM:\n" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "========== tsort sürüyor ...\n" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "(bir sayý deðil)" @@ -1594,37 +1594,37 @@ msgstr "========= Pakette bulunmayan dizinler:\n" msgid "%10d %s\n" msgstr "%9d %s\n" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "%s dizin %04o izinleriyle oluþturuldu.\n" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "%s / %s dizin silinemedi - Dizin boþ deðil\n" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "%s / %s dizinin silinmesi baþarýsýz: %s\n" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "%s / %s bað kaldýrýlamadý: %s\n" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluþturuldu\n" @@ -1892,193 +1892,213 @@ msgstr "y msgid "upgrade package(s)" msgstr "paket günceller" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "tüm paketleri sorgular/doðrular" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 #, fuzzy msgid "rpm checksig mode" msgstr "rpm denetleme kipi" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "dosyayý içeren paketleri sorgular/denetler" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +#, fuzzy +msgid "query/verify package(s) with file identifier" +msgstr "dosyayý içeren paketleri sorgular/denetler" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "gruptaki paketleri sorgular/denetler" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +#, fuzzy +msgid "query/verify package(s) with header identifier" +msgstr "dosyayý içeren paketleri sorgular/denetler" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" "bir paket dosyasýný sorgular/denetler (örn. bir çalýþtýrýlabilir *.rpm " "dosyasý)" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +#, fuzzy +msgid "query/verify package(s) with package identifier" +msgstr "dosyayý içeren paketleri sorgular/denetler" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "rpm sorgulama kipi" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "tanýmlanmýþ sorgulama etiketlerini gösterir" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "bir spec dosyasýný sorgular" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +#, fuzzy +msgid "query/verify package(s) from install transaction" +msgstr "gruptaki paketleri sorgular/denetler" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "paket tarafýndan tetiklenen paketleri sorgular" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "rpm denetleme kipi" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "rpm denetleme kipi (eski tip)" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "bir baðýmlýlýk gerektiren paketleri sorgular/denetler" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "bir baðýmlýlýðý saðlayan paketleri sorgular/denetler" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "tüm yapýlandýrma dosyalarýný listeler" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "tüm belgeleme dosyalarýný gösterir" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "temel dosya bilgilerini gösterir" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "paketteki dosyalarý gösterir" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "%%ghost dosyalarý atlanýr" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "%%license dosyalarý atlanýr" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "%%readme dosyalarý atlanýr" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "izleyen sorgulama biçimini kullanýr" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "spec dosyasýndaki i18n bölümleri yerine kullanýlýr" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "listelenmiþ dosyalarýn durumunu gösterir" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "ayrýntýlý dosya listesi gösterir" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "dosyalarýn uzunluklarý doðrulanmaz" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "dosyalarýn sahipleri doðrulanmaz" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "dosyalarýn gruplarý doðrulanmaz" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "dosyalarýn deðiþiklik zamanlarý doðrulanmaz" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "dosyalarýn kipleri doðrulanmaz" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "paketteki dosyalar doðrulanamaz" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "paket baðýmlýlýklarý doðrulanmaz" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 #, fuzzy msgid "don't execute verify script(s)" msgstr "(varsa) %verifyscript çalýþtýrýlmaz" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 #, fuzzy msgid "don't verify digest(s)" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 #, fuzzy msgid "don't verify signature(s)" msgstr "dosyalarýn sembolik bað dosya yollarý doðrulanmaz" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 #, fuzzy msgid "don't verify GPG V3 DSA signature(s)" msgstr "Baþlýk SHA1 özümlemesi doðrulanmaz" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 #, fuzzy msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "dosyalarýn MD5 özümlemesi doðrulanmaz" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 #, fuzzy msgid "sign a package, preserving other existing signatures" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 #, fuzzy msgid "verify package signature(s)" msgstr "paket imzasýný denetler" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 #, fuzzy msgid "sign a package, discarding all current signatures" msgstr "paketi imzalar (mevcut imza kaldýrýlýr)" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "imza üretir" @@ -2163,7 +2183,7 @@ msgid "is needed by" msgstr " %s-%s-%s için gerekli\n" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "%d veri türü desteklenmiyor\n" @@ -2211,31 +2231,31 @@ msgstr "%s: %s-%s-%s %d dosya i msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "kullanýcý %s yok - root kullanýlacak\n" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "grup %s yok - root kullanýlacak\n" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr " dosyada " -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, fuzzy, c-format msgid "%s failed on file %s: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, fuzzy, c-format msgid "%s failed: %s\n" msgstr "%s baþarýsýz\n" @@ -2283,81 +2303,91 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi i msgid "can't query %s: %s\n" msgstr "%s sorgulanamýyor: %s\n" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "%s açýlamadý: %s\n" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "eski biçem kaynak paketleri sorgulanamaz\n" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, fuzzy, c-format msgid "%s: read manifest failed: %s\n" msgstr "%s: bildirge okuma baþarýsýz: %s\n" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "%s spec dosyasýnýn sorgulanmasý baþarýsýz, çözümlenemiyor\n" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "paket yok\n" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "%s tetikleyen paket yok\n" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, fuzzy, c-format +msgid "malformed %s: %s\n" +msgstr "%s okunamadý: %s.\n" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, fuzzy, c-format +msgid "no package matches %s: %s\n" +msgstr "%s tetikleyen paket yok\n" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "%s gerektiren paket yok\n" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "%s saðlayan paket yok\n" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "dosya %s: %s\n" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "%s dosyasý, hiç bir pakete ait deðil\n" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "geçersiz paket numarasý: %s\n" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "paket kayýt numarasý: %u\n" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "%u. kayýt okunamadý\n" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "%s paketi kurulu deðil\n" @@ -2956,82 +2986,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "dataLength() RPM_STRING_TYPE sayýsý 1 olmalý.\n" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "%% den sonraki { yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "%%{ den sonraki } yok" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "etiket biçemi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "etiket ismi boþ" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "bilinmeyen etiket" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "dizinin sonunda ] gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "beklenmeyen ]" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "beklenmeyen }" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "ifade içerisinde ? gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "ifade içerisinde ? dan sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "ifade içinde } gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "? alt ifadesinden sonra : gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "ifade içersinde : den sonra { gerekli" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "ifadenin sonunda | gerekli" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "(bilinmeyen tür)" @@ -3100,7 +3130,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "paketler taranýrken hata(%d)\n" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "veritabanýndaki %u. kayýt hatalý -- atlanýyor\n" @@ -3115,244 +3145,244 @@ msgstr "rpmdb: bozuk ba msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de baþlýk okunamadý\n" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "\"%s\" %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "%d girdi %s indeksinden siliniyor.\n" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "yeni paket örneðini tutma hatasý(%d)\n" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "\"%s\" %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "%d girdi %s indeksine ekleniyor.\n" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "baþarýlý db3 yeniden oluþturma ertesinde %s kaldýrýlýyor\n" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "belirtilmiþ bir dbpath yok" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "%s veritabaný %s içinde yeniden oluþturuluyor\n" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "geçici veritabaný %s zaten mevcut\n" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "%s dizini oluþturuluyor\n" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "%s dizini oluþturuluyor: %s\n" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "eski veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "yeni veritabaný dbapi %d ile açýlýyor\n" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayýt özgün olarak %u e eklenemedi\n" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabaný yeniden oluþturulamadý: mevcut veritabaný deðiþmeden\n" "yerinde býrakýldý\n" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanýnýn yenisiyle deðiþtirilirmesi baþarýsýz!\n" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla deðiþtiriliyor" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "%s dizini siliniyor\n" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi baþarýsýz: %s\n" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "======================== %d etkin %d boþ\n" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "%3d>%*s(boþ)" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "%3d<%*s(boþ)\n" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "%%%s makrosunun gövdesi sonlandýrýlmamýþ\n" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "%%%s makrosunu seçenekleri sonlandýrýlmamýþ\n" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "%%%s makrosu boþ\n" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "%%%s makrosu geniþletmede baþarýsýz\n" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "%%%s makrosunun ismi kuraldýþý (%%define)\n" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "%%%s (%s) makrosu %d seviyenin altýnda kullanýlmadý\n" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "%c seçeneði %s(%s) de anlaþýlamadý\n" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "Yineleme derinliði(%d) mümkün miktardan(%d) büyük\n" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "%c sonlandýrýlmamýþ: %s\n" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "Bir ayrýþtýrýlamayan makro tarafýndan bir %% izlendi\n" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "%%%.*s makrosu bulunamadý, atlanýyor\n" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "Hedef tampon bellek taþtý\n" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "%s dosyasý: %s\n" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "%s dosyasý %u bayttan küçük\n" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "Baþarýlý" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "Sunucudan kötü yanýt" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "Sunucu G/Ç hatasý" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "Sunucu zaman aþýmý" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "Sunucu makina adresi bulunamadý" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "Sunucu makina ismi bulunamadý" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "Sunucuya baðlanýlamadý" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "Sunucuya veri baðlantýsý kurulamadý" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "Yerel dosyaya G/Ç hatasý" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "Karþý sunucuyu pasif kipe sokma ayarlarýnda hata" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "Dosya sunucuda bulunamadý" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "Kesme iþlemi sürüyor" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "Bilinmeyen ya da beklenmeyen hata" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "%s sunucusuna %s olarak giriliyor, parola %s\n" diff --git a/po/uk.po b/po/uk.po index 13e2cae..b5760a5 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/wa.po b/po/wa.po index 13e2cae..b5760a5 100644 --- a/po/wa.po +++ b/po/wa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/zh.po b/po/zh.po index 13e2cae..b5760a5 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 13e2cae..b5760a5 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-02-01 10:09-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,353 +78,353 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: rpmqv.c:109 +#: rpmqv.c:108 msgid "print the version of rpm being used" msgstr "" -#: rpmqv.c:112 +#: rpmqv.c:111 msgid "provide less detailed output" msgstr "" -#: rpmqv.c:114 +#: rpmqv.c:113 msgid "provide more detailed output" msgstr "" -#: rpmqv.c:116 +#: rpmqv.c:115 msgid "define macro with value " msgstr "" -#: rpmqv.c:117 +#: rpmqv.c:116 msgid "' '" msgstr "" -#: rpmqv.c:119 +#: rpmqv.c:118 msgid "print macro expansion of +" msgstr "" -#: rpmqv.c:120 +#: rpmqv.c:119 msgid "+" msgstr "" -#: rpmqv.c:122 +#: rpmqv.c:121 msgid "send stdout to " msgstr "" -#: rpmqv.c:123 +#: rpmqv.c:122 msgid "" msgstr "" -#: rpmqv.c:125 +#: rpmqv.c:124 msgid "use as the top level directory" msgstr "" -#: lib/poptI.c:210 rpmqv.c:126 +#: lib/poptI.c:210 rpmqv.c:125 msgid "" msgstr "" -#: rpmqv.c:128 +#: rpmqv.c:127 msgid "read instead of default macro file(s)" msgstr "" -#: rpmqv.c:129 rpmqv.c:133 rpmqv.c:137 +#: rpmqv.c:128 rpmqv.c:132 rpmqv.c:136 msgid "" msgstr "" -#: rpmqv.c:132 rpmqv.c:136 +#: rpmqv.c:131 rpmqv.c:135 msgid "read instead of default rpmrc file(s)" msgstr "" -#: rpmqv.c:140 +#: rpmqv.c:139 msgid "display final rpmrc and macro configuration" msgstr "" -#: rpmqv.c:145 +#: rpmqv.c:144 msgid "disable use of libio(3) API" msgstr "" -#: rpmqv.c:148 +#: rpmqv.c:147 msgid "debug protocol data stream" msgstr "" -#: rpmqv.c:150 +#: rpmqv.c:149 msgid "debug rpmio I/O" msgstr "" -#: rpmqv.c:152 +#: rpmqv.c:151 msgid "debug URL cache handling" msgstr "" -#: rpmqv.c:172 +#: rpmqv.c:171 msgid "Query options (with -q or --query):" msgstr "" -#: rpmqv.c:175 +#: rpmqv.c:174 msgid "Verify options (with -V or --verify):" msgstr "" -#: rpmqv.c:181 +#: rpmqv.c:180 msgid "Signature options:" msgstr "" -#: rpmqv.c:187 +#: rpmqv.c:186 msgid "Database options:" msgstr "" -#: rpmqv.c:193 +#: rpmqv.c:192 msgid "Build options with [ | | ]:" msgstr "" -#: rpmqv.c:199 +#: rpmqv.c:198 msgid "Install/Upgrade/Erase options:" msgstr "" -#: rpmqv.c:204 +#: rpmqv.c:203 msgid "Common options for all rpm modes:" msgstr "" #. @-modfilesys -globs @ -#: lib/poptI.c:27 rpmqv.c:221 +#: lib/poptI.c:27 rpmqv.c:220 #, c-format msgid "%s: %s\n" msgstr "" -#: rpmqv.c:229 +#: rpmqv.c:228 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpmqv.c:236 +#: rpmqv.c:235 msgid "Copyright (C) 1998-2000 - Red Hat, Inc." msgstr "" -#: rpmqv.c:237 +#: rpmqv.c:236 msgid "This program may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpmqv.c:249 +#: rpmqv.c:248 #, c-format msgid "Usage: %s {--help}\n" msgstr "" -#: rpmqv.c:589 +#: rpmqv.c:593 msgid "The --rcfile option has been eliminated.\n" msgstr "" -#: rpmqv.c:590 +#: rpmqv.c:594 msgid "Use \"--macros \" instead.\n" msgstr "" -#: rpmqv.c:596 +#: rpmqv.c:600 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpmqv.c:637 rpmqv.c:643 rpmqv.c:649 rpmqv.c:687 +#: rpmqv.c:641 rpmqv.c:647 rpmqv.c:653 rpmqv.c:691 msgid "only one major mode may be specified" msgstr "" -#: rpmqv.c:666 +#: rpmqv.c:670 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpmqv.c:670 +#: rpmqv.c:674 msgid "unexpected query flags" msgstr "" -#: rpmqv.c:673 +#: rpmqv.c:677 msgid "unexpected query format" msgstr "" -#: rpmqv.c:676 +#: rpmqv.c:680 msgid "unexpected query source" msgstr "" -#: rpmqv.c:717 +#: rpmqv.c:721 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpmqv.c:723 +#: rpmqv.c:727 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpmqv.c:725 +#: rpmqv.c:729 msgid "files may only be relocated during package installation" msgstr "" -#: rpmqv.c:728 +#: rpmqv.c:732 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpmqv.c:731 +#: rpmqv.c:735 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpmqv.c:734 +#: rpmqv.c:738 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpmqv.c:737 +#: rpmqv.c:741 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpmqv.c:740 +#: rpmqv.c:744 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpmqv.c:744 +#: rpmqv.c:748 msgid "--percent may only be specified during package installation" msgstr "" -#: rpmqv.c:749 +#: rpmqv.c:753 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpmqv.c:753 +#: rpmqv.c:757 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpmqv.c:757 +#: rpmqv.c:761 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:761 +#: rpmqv.c:765 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpmqv.c:765 +#: rpmqv.c:769 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpmqv.c:769 +#: rpmqv.c:773 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpmqv.c:773 +#: rpmqv.c:777 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpmqv.c:778 +#: rpmqv.c:782 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpmqv.c:782 +#: rpmqv.c:786 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpmqv.c:786 +#: rpmqv.c:790 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpmqv.c:791 +#: rpmqv.c:795 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpmqv.c:796 +#: rpmqv.c:800 msgid "" "script disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:801 +#: rpmqv.c:805 msgid "" "trigger disabling options may only be specified during package installation " "and erasure" msgstr "" -#: rpmqv.c:805 +#: rpmqv.c:809 msgid "" "--nodeps may only be specified during package building, rebuilding, " "recompilation, installation,erasure, and verification" msgstr "" -#: rpmqv.c:810 +#: rpmqv.c:814 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpmqv.c:815 +#: rpmqv.c:819 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpmqv.c:827 +#: rpmqv.c:831 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpmqv.c:851 +#: rpmqv.c:855 msgid "no files to sign\n" msgstr "" -#: rpmqv.c:856 +#: rpmqv.c:860 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpmqv.c:875 +#: rpmqv.c:879 msgid "pgp not found: " msgstr "" -#: rpmqv.c:880 +#: rpmqv.c:884 msgid "Enter pass phrase: " msgstr "" -#: rpmqv.c:882 +#: rpmqv.c:886 msgid "Pass phrase check failed\n" msgstr "" -#: rpmqv.c:886 +#: rpmqv.c:890 msgid "Pass phrase is good.\n" msgstr "" -#: rpmqv.c:891 +#: rpmqv.c:895 #, c-format msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpmqv.c:898 +#: rpmqv.c:902 msgid "--sign may only be used during package building" msgstr "" -#: rpmqv.c:915 +#: rpmqv.c:919 msgid "exec failed\n" msgstr "" -#: rpmqv.c:947 +#: rpmqv.c:951 msgid "no packages files given for rebuild" msgstr "" -#: rpmqv.c:1015 +#: rpmqv.c:1019 msgid "no spec files given for build" msgstr "" -#: rpmqv.c:1017 +#: rpmqv.c:1021 msgid "no tar files given for build" msgstr "" -#: rpmqv.c:1036 +#: rpmqv.c:1043 msgid "no packages given for erase" msgstr "" -#: rpmqv.c:1047 +#: rpmqv.c:1085 msgid "no packages given for install" msgstr "" -#: rpmqv.c:1093 +#: rpmqv.c:1103 msgid "no arguments given for query" msgstr "" -#: rpmqv.c:1106 +#: rpmqv.c:1116 msgid "no arguments given for verify" msgstr "" -#: rpmqv.c:1114 +#: rpmqv.c:1124 msgid "unexpected arguments to --querytags " msgstr "" -#: rpmqv.c:1130 +#: rpmqv.c:1140 msgid "no arguments given" msgstr "" @@ -815,7 +815,7 @@ msgstr "" msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:603 lib/psm.c:1426 +#: build/pack.c:603 lib/psm.c:1444 #, c-format msgid "Unable to write package: %s\n" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Unable to write payload to %s: %s\n" msgstr "" -#: build/pack.c:683 lib/psm.c:1700 +#: build/pack.c:683 lib/psm.c:1725 #, c-format msgid "Wrote: %s\n" msgstr "" @@ -1456,48 +1456,48 @@ msgstr "" msgid "YES" msgstr "" -#: lib/depends.c:958 +#: lib/depends.c:962 #, c-format msgid "ignore package name relation(s) [%d]\t%s -> %s\n" msgstr "" -#: lib/depends.c:1073 +#: lib/depends.c:1081 #, c-format msgid "removing %s \"%s\" from tsort relations.\n" msgstr "" #. Record all relations. -#: lib/depends.c:1341 +#: lib/depends.c:1349 msgid "========== recording tsort relations\n" msgstr "" #. T4. Scan for zeroes. -#: lib/depends.c:1447 +#: lib/depends.c:1455 msgid "" "========== tsorting packages (order, #predecessors, #succesors, tree, " "depth)\n" msgstr "" -#: lib/depends.c:1540 +#: lib/depends.c:1548 msgid "========== successors only (presentation order)\n" msgstr "" -#: lib/depends.c:1610 +#: lib/depends.c:1618 msgid "LOOP:\n" msgstr "" -#: lib/depends.c:1645 +#: lib/depends.c:1653 msgid "========== continuing tsort ...\n" msgstr "" #. Return no. of packages that could not be ordered. -#: lib/depends.c:1650 +#: lib/depends.c:1658 #, c-format msgid "rpmdepOrder failed, %d elements remain\n" msgstr "" #: lib/formats.c:29 lib/formats.c:53 lib/formats.c:84 lib/formats.c:281 -#: rpmdb/header.c:2965 rpmdb/header.c:2986 rpmdb/header.c:3008 +#: rpmdb/header.c:2951 rpmdb/header.c:2972 rpmdb/header.c:2994 msgid "(not a number)" msgstr "" @@ -1547,37 +1547,37 @@ msgstr "" msgid "%10d %s\n" msgstr "" -#: lib/fsm.c:1185 +#: lib/fsm.c:1191 #, c-format msgid "%s directory created with perms %04o.\n" msgstr "" -#: lib/fsm.c:1470 +#: lib/fsm.c:1476 #, c-format msgid "archive file %s was not found in header file list\n" msgstr "" -#: lib/fsm.c:1591 lib/fsm.c:1719 +#: lib/fsm.c:1597 lib/fsm.c:1727 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:1745 +#: lib/fsm.c:1753 #, c-format msgid "%s rmdir of %s failed: Directory not empty\n" msgstr "" -#: lib/fsm.c:1751 +#: lib/fsm.c:1759 #, c-format msgid "%s rmdir of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1761 +#: lib/fsm.c:1769 #, c-format msgid "%s unlink of %s failed: %s\n" msgstr "" -#: lib/fsm.c:1780 +#: lib/fsm.c:1791 #, c-format msgid "%s created as %s\n" msgstr "" @@ -1834,182 +1834,198 @@ msgstr "" msgid "upgrade package(s)" msgstr "" -#: lib/poptQV.c:83 +#: lib/poptQV.c:95 msgid "query/verify all packages" msgstr "" -#: lib/poptQV.c:85 +#: lib/poptQV.c:97 msgid "rpm checksig mode" msgstr "" -#: lib/poptQV.c:87 +#: lib/poptQV.c:99 msgid "query/verify package(s) owning file" msgstr "" -#: lib/poptQV.c:89 +#: lib/poptQV.c:101 +msgid "query/verify package(s) with file identifier" +msgstr "" + +#: lib/poptQV.c:103 msgid "query/verify package(s) in group" msgstr "" -#: lib/poptQV.c:91 +#: lib/poptQV.c:105 +msgid "query/verify package(s) with header identifier" +msgstr "" + +#: lib/poptQV.c:107 msgid "query/verify a package file (i.e. a binary *.rpm file)" msgstr "" -#: lib/poptQV.c:93 +#: lib/poptQV.c:109 +msgid "query/verify package(s) with package identifier" +msgstr "" + +#: lib/poptQV.c:111 msgid "rpm query mode" msgstr "" -#: lib/poptQV.c:97 +#: lib/poptQV.c:115 msgid "display known query tags" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "query a spec file" msgstr "" -#: lib/poptQV.c:99 +#: lib/poptQV.c:117 msgid "" msgstr "" -#: lib/poptQV.c:101 +#: lib/poptQV.c:119 +msgid "query/verify package(s) from install transaction" +msgstr "" + +#: lib/poptQV.c:121 msgid "query the package(s) triggered by the package" msgstr "" -#: lib/poptQV.c:103 +#: lib/poptQV.c:123 msgid "rpm verify mode" msgstr "" -#: lib/poptQV.c:106 +#: lib/poptQV.c:126 msgid "rpm verify mode (legacy)" msgstr "" -#: lib/poptQV.c:108 +#: lib/poptQV.c:128 msgid "query/verify the package(s) which require a dependency" msgstr "" -#: lib/poptQV.c:110 +#: lib/poptQV.c:130 msgid "query/verify the package(s) which provide a dependency" msgstr "" -#: lib/poptQV.c:170 +#: lib/poptQV.c:190 msgid "list all configuration files" msgstr "" -#: lib/poptQV.c:172 +#: lib/poptQV.c:192 msgid "list all documentation files" msgstr "" -#: lib/poptQV.c:174 +#: lib/poptQV.c:194 msgid "dump basic file information" msgstr "" -#: lib/poptQV.c:176 +#: lib/poptQV.c:196 msgid "list files in package" msgstr "" -#: lib/poptQV.c:181 +#: lib/poptQV.c:201 #, c-format msgid "skip %%ghost files" msgstr "" -#: lib/poptQV.c:185 +#: lib/poptQV.c:205 #, c-format msgid "skip %%license files" msgstr "" -#: lib/poptQV.c:188 +#: lib/poptQV.c:208 #, c-format msgid "skip %%readme files" msgstr "" -#: lib/poptQV.c:194 +#: lib/poptQV.c:214 msgid "use the following query format" msgstr "" -#: lib/poptQV.c:196 +#: lib/poptQV.c:216 msgid "substitute i18n sections into spec file" msgstr "" -#: lib/poptQV.c:198 +#: lib/poptQV.c:218 msgid "display the states of the listed files" msgstr "" -#: lib/poptQV.c:200 +#: lib/poptQV.c:220 msgid "display a verbose file listing" msgstr "" -#: lib/poptQV.c:220 lib/poptQV.c:262 lib/poptQV.c:296 +#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316 msgid "don't verify MD5 digest of files" msgstr "" -#: lib/poptQV.c:223 +#: lib/poptQV.c:243 msgid "don't verify size of files" msgstr "" -#: lib/poptQV.c:226 +#: lib/poptQV.c:246 msgid "don't verify symlink path of files" msgstr "" -#: lib/poptQV.c:229 +#: lib/poptQV.c:249 msgid "don't verify owner of files" msgstr "" -#: lib/poptQV.c:232 +#: lib/poptQV.c:252 msgid "don't verify group of files" msgstr "" -#: lib/poptQV.c:235 +#: lib/poptQV.c:255 msgid "don't verify modification time of files" msgstr "" -#: lib/poptQV.c:238 lib/poptQV.c:241 +#: lib/poptQV.c:258 lib/poptQV.c:261 msgid "don't verify mode of files" msgstr "" -#: lib/poptQV.c:244 +#: lib/poptQV.c:264 msgid "don't verify files in package" msgstr "" -#: lib/poptQV.c:246 +#: lib/poptQV.c:266 msgid "don't verify package dependencies" msgstr "" -#: lib/poptQV.c:248 lib/poptQV.c:252 +#: lib/poptQV.c:268 lib/poptQV.c:272 msgid "don't execute verify script(s)" msgstr "" -#: lib/poptQV.c:255 +#: lib/poptQV.c:275 msgid "don't verify digest(s)" msgstr "" -#: lib/poptQV.c:258 +#: lib/poptQV.c:278 msgid "don't verify signature(s)" msgstr "" -#: lib/poptQV.c:266 lib/poptQV.c:300 +#: lib/poptQV.c:286 lib/poptQV.c:320 msgid "don't verify GPG V3 DSA signature(s)" msgstr "" -#: lib/poptQV.c:269 lib/poptQV.c:303 +#: lib/poptQV.c:289 lib/poptQV.c:323 msgid "don't verify PGP V3 RSA/MD5 signature(s)" msgstr "" -#: lib/poptQV.c:284 +#: lib/poptQV.c:304 msgid "sign a package, preserving other existing signatures" msgstr "" -#: lib/poptQV.c:286 +#: lib/poptQV.c:306 msgid "verify package signature(s)" msgstr "" -#: lib/poptQV.c:288 +#: lib/poptQV.c:308 msgid "import an armored public key" msgstr "" -#: lib/poptQV.c:290 +#: lib/poptQV.c:310 msgid "sign a package, discarding all current signatures" msgstr "" -#: lib/poptQV.c:292 +#: lib/poptQV.c:312 msgid "generate signature" msgstr "" @@ -2092,7 +2108,7 @@ msgid "is needed by" msgstr "" #. @-modfilesys@ -#: lib/psm.c:247 rpmdb/header.c:384 rpmdb/header_internal.c:161 +#: lib/psm.c:247 rpmdb/header.c:383 rpmdb/header_internal.c:161 #, c-format msgid "Data type %d not supported\n" msgstr "" @@ -2140,31 +2156,31 @@ msgstr "" msgid "%s: %s scriptlet failed (%d), skipping %s\n" msgstr "" -#: lib/psm.c:1468 +#: lib/psm.c:1493 #, c-format msgid "user %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1477 +#: lib/psm.c:1502 #, c-format msgid "group %s does not exist - using root\n" msgstr "" -#: lib/psm.c:1519 +#: lib/psm.c:1544 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:1520 +#: lib/psm.c:1545 msgid " on file " msgstr "" -#: lib/psm.c:1708 +#: lib/psm.c:1733 #, c-format msgid "%s failed on file %s: %s\n" msgstr "" -#: lib/psm.c:1711 +#: lib/psm.c:1736 #, c-format msgid "%s failed: %s\n" msgstr "" @@ -2212,81 +2228,91 @@ msgstr "" msgid "can't query %s: %s\n" msgstr "" -#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:333 lib/rpminstall.c:475 +#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475 #: lib/rpminstall.c:845 #, c-format msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:615 +#: lib/query.c:633 #, c-format msgid "query of %s failed\n" msgstr "" -#: lib/query.c:621 +#: lib/query.c:639 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:647 lib/rpminstall.c:488 +#: lib/query.c:665 lib/rpminstall.c:488 #, c-format msgid "%s: read manifest failed: %s\n" msgstr "" -#: lib/query.c:691 +#: lib/query.c:709 #, c-format msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/query.c:712 +#: lib/query.c:730 msgid "no packages\n" msgstr "" -#: lib/query.c:732 +#: lib/query.c:750 #, c-format msgid "group %s does not contain any packages\n" msgstr "" -#: lib/query.c:742 +#: lib/query.c:760 #, c-format msgid "no package triggers %s\n" msgstr "" -#: lib/query.c:752 +#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845 +#, c-format +msgid "malformed %s: %s\n" +msgstr "" + +#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850 +#, c-format +msgid "no package matches %s: %s\n" +msgstr "" + +#: lib/query.c:861 #, c-format msgid "no package requires %s\n" msgstr "" -#: lib/query.c:763 +#: lib/query.c:872 #, c-format msgid "no package provides %s\n" msgstr "" -#: lib/query.c:798 +#: lib/query.c:906 #, c-format msgid "file %s: %s\n" msgstr "" -#: lib/query.c:802 +#: lib/query.c:910 #, c-format msgid "file %s is not owned by any package\n" msgstr "" -#: lib/query.c:829 +#: lib/query.c:937 #, c-format msgid "invalid package number: %s\n" msgstr "" -#: lib/query.c:832 +#: lib/query.c:940 #, c-format msgid "package record number: %u\n" msgstr "" -#: lib/query.c:837 +#: lib/query.c:945 #, c-format msgid "record %u could not be read\n" msgstr "" -#: lib/query.c:848 lib/rpminstall.c:633 +#: lib/query.c:956 lib/rpminstall.c:633 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2869,82 +2895,82 @@ msgstr "" #. This should not be allowed #. @-modfilesys@ -#: rpmdb/header.c:347 +#: rpmdb/header.c:346 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2222 +#: rpmdb/header.c:2208 #, c-format msgid "missing { after %" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2252 +#: rpmdb/header.c:2238 msgid "missing } after %{" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2266 +#: rpmdb/header.c:2252 msgid "empty tag format" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2280 +#: rpmdb/header.c:2266 msgid "empty tag name" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2297 +#: rpmdb/header.c:2283 msgid "unknown tag" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2324 +#: rpmdb/header.c:2310 msgid "] expected at end of array" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2342 +#: rpmdb/header.c:2328 msgid "unexpected ]" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2346 +#: rpmdb/header.c:2332 msgid "unexpected }" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2412 +#: rpmdb/header.c:2398 msgid "? expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2421 +#: rpmdb/header.c:2407 msgid "{ expected after ? in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2434 rpmdb/header.c:2476 +#: rpmdb/header.c:2420 rpmdb/header.c:2462 msgid "} expected in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2444 +#: rpmdb/header.c:2430 msgid ": expected following ? subexpression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2461 +#: rpmdb/header.c:2447 msgid "{ expected after : in expression" msgstr "" #. @-observertrans -readonlytrans@ -#: rpmdb/header.c:2486 +#: rpmdb/header.c:2472 msgid "| expected at end of expression" msgstr "" -#: rpmdb/header.c:2709 +#: rpmdb/header.c:2695 msgid "(unknown type)" msgstr "" @@ -3011,7 +3037,7 @@ msgstr "" msgid "error(%d) counting packages\n" msgstr "" -#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3350 +#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372 #, c-format msgid "record number %u in database is bad -- skipping.\n" msgstr "" @@ -3026,242 +3052,242 @@ msgstr "" msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: rpmdb/rpmdb.c:2492 +#: rpmdb/rpmdb.c:2540 #, c-format msgid "removing \"%s\" from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2501 +#: rpmdb/rpmdb.c:2544 #, c-format msgid "removing %d entries from %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2702 +#: rpmdb/rpmdb.c:2714 #, c-format msgid "error(%d) allocating new package instance\n" msgstr "" -#: rpmdb/rpmdb.c:2783 +#: rpmdb/rpmdb.c:2873 #, c-format msgid "adding \"%s\" to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:2794 +#: rpmdb/rpmdb.c:2877 #, c-format msgid "adding %d entries to %s index.\n" msgstr "" -#: rpmdb/rpmdb.c:3236 +#: rpmdb/rpmdb.c:3258 #, c-format msgid "removing %s after successful db3 rebuild.\n" msgstr "" -#: rpmdb/rpmdb.c:3269 +#: rpmdb/rpmdb.c:3291 msgid "no dbpath has been set" msgstr "" -#: rpmdb/rpmdb.c:3296 +#: rpmdb/rpmdb.c:3318 #, c-format msgid "rebuilding database %s into %s\n" msgstr "" -#: rpmdb/rpmdb.c:3300 +#: rpmdb/rpmdb.c:3322 #, c-format msgid "temporary database %s already exists\n" msgstr "" -#: rpmdb/rpmdb.c:3306 +#: rpmdb/rpmdb.c:3328 #, c-format msgid "creating directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3308 +#: rpmdb/rpmdb.c:3330 #, c-format msgid "creating directory %s: %s\n" msgstr "" -#: rpmdb/rpmdb.c:3315 +#: rpmdb/rpmdb.c:3337 #, c-format msgid "opening old database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3326 +#: rpmdb/rpmdb.c:3348 #, c-format msgid "opening new database with dbapi %d\n" msgstr "" -#: rpmdb/rpmdb.c:3390 +#: rpmdb/rpmdb.c:3412 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: rpmdb/rpmdb.c:3408 +#: rpmdb/rpmdb.c:3430 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: rpmdb/rpmdb.c:3416 +#: rpmdb/rpmdb.c:3438 msgid "failed to replace old database with new database!\n" msgstr "" -#: rpmdb/rpmdb.c:3418 +#: rpmdb/rpmdb.c:3440 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: rpmdb/rpmdb.c:3428 +#: rpmdb/rpmdb.c:3450 #, c-format msgid "removing directory %s\n" msgstr "" -#: rpmdb/rpmdb.c:3430 +#: rpmdb/rpmdb.c:3452 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" -#: rpmio/rpmio.c:656 +#: rpmio/rpmio.c:660 msgid "Success" msgstr "" -#: rpmio/rpmio.c:659 +#: rpmio/rpmio.c:663 msgid "Bad server response" msgstr "" -#: rpmio/rpmio.c:662 +#: rpmio/rpmio.c:666 msgid "Server I/O error" msgstr "" -#: rpmio/rpmio.c:665 +#: rpmio/rpmio.c:669 msgid "Server timeout" msgstr "" -#: rpmio/rpmio.c:668 +#: rpmio/rpmio.c:672 msgid "Unable to lookup server host address" msgstr "" -#: rpmio/rpmio.c:671 +#: rpmio/rpmio.c:675 msgid "Unable to lookup server host name" msgstr "" -#: rpmio/rpmio.c:674 +#: rpmio/rpmio.c:678 msgid "Failed to connect to server" msgstr "" -#: rpmio/rpmio.c:677 +#: rpmio/rpmio.c:681 msgid "Failed to establish data connection to server" msgstr "" -#: rpmio/rpmio.c:680 +#: rpmio/rpmio.c:684 msgid "I/O error to local file" msgstr "" -#: rpmio/rpmio.c:683 +#: rpmio/rpmio.c:687 msgid "Error setting remote server to passive mode" msgstr "" -#: rpmio/rpmio.c:686 +#: rpmio/rpmio.c:690 msgid "File not found on server" msgstr "" -#: rpmio/rpmio.c:689 +#: rpmio/rpmio.c:693 msgid "Abort in progress" msgstr "" -#: rpmio/rpmio.c:693 +#: rpmio/rpmio.c:697 msgid "Unknown or unexpected error" msgstr "" -#: rpmio/rpmio.c:1365 +#: rpmio/rpmio.c:1369 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" diff --git a/popt/ABOUT-NLS b/popt/ABOUT-NLS new file mode 100644 index 0000000..5fde45a --- /dev/null +++ b/popt/ABOUT-NLS @@ -0,0 +1,324 @@ +Notes on the Free Translation Project +************************************* + + Free software is going international! The Free Translation Project +is a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do _not_ +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. + + Installers will find here some useful hints. These notes also +explain how users should proceed for getting the programs to use the +available translations. They tell how people wanting to contribute and +work at translations should contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +Quick configuration advice +========================== + + If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +INSTALL Matters +=============== + + Some packages are "localizable" when properly installed; the +programs they contain can be made to speak your own native language. +Most such packages use GNU `gettext'. Other packages have their own +ways to internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the GNU `gettext' own +library will be used. This library is wholly contained within this +package, usually in the `intl/' subdirectory, so prior installation of +the GNU `gettext' package is _not_ required. Installers may use +special options at configuration time for changing the default +behaviour. The commands: + + ./configure --with-included-gettext + ./configure --disable-nls + +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might be not what is desirable. You +should use the more recent version of the GNU `gettext' library. I.e. +if the file `intl/VERSION' shows that the library which comes with this +package is more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. + + Internationalized packages have usually many `po/LL.po' files, where +LL gives an ISO 639 two-letter code identifying the language. Unless +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +Using This Package +================== + + As a user, if your language has been installed for this package, you +only have to set the `LANG' environment variable to the appropriate +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. + +Translating Teams +================= + + For the Free Translation Project to be a success, we need interested +people who like their own language and write it well, and who are also +able to synergize with other translators speaking the same language. +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/', in the "National teams" +area. + + If you'd like to volunteer to _work_ at translating messages, you +should become a member of the translating team for your own language. +The subscribing address is _not_ the same as the list itself, it has +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate +_actively_ in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `translation@iro.umontreal.ca' to reach the +coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing +the terminology in use. Proven linguistic skill are praised more than +programming skill, here. + +Available Packages +================== + + Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of September +2001. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja + +----------------------------------------------------+ + a2ps | [] [] [] | + bash | [] [] [] [] | + bfd | | + binutils | [] | + bison | [] [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] [] | + fetchmail | | + fileutils | [] [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + freetype | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext | [] [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] [] [] | + gprof | | + grep | [] [] [] [] [] [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] | + jpilot | [] | + kbd | | + ld | [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] [] [] [] | + make | [] [] [] [] [] [] | + mysecretdiary | [] | + nano | [] [] [] | + opcodes | | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + sketch | | + soundtracker | [] [] [] | + sp | | + tar | [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] [] [] | + textutils | [] [] [] [] [] [] [] [] | + util-linux | [] [] | + wdiff | [] [] [] | + wget | [] [] [] [] [] [] [] [] [] [] | + +----------------------------------------------------+ + bg cs da de el en eo es et fi fr gl he hr id it ja + 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + + ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + +----------------------------------------------------+ + a2ps | [] [] [] | 6 + bash | | 4 + bfd | | 0 + binutils | | 1 + bison | [] | 6 + clisp | [] | 5 + cpio | [] [] [] [] [] | 10 + diffutils | [] [] [] [] | 11 + enscript | [] [] [] | 5 + error | [] [] | 4 + fetchmail | | 0 + fileutils | [] [] [] [] [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] [] [] | 16 + flex | [] [] [] | 6 + freetype | | 0 + gas | | 0 + gawk | [] | 3 + gcal | | 0 + gcc | | 0 + gettext | [] [] [] [] [] [] [] [] | 18 + gnupg | [] [] [] | 10 + gprof | | 0 + grep | [] [] [] [] | 12 + hello | [] [] [] [] [] [] [] [] [] [] [] | 22 + id-utils | [] [] [] | 6 + indent | [] [] [] [] [] [] [] | 12 + jpilot | | 1 + kbd | [] | 1 + ld | | 1 + libc | [] [] [] [] [] [] [] [] | 16 + lilypond | [] [] | 3 + lynx | [] [] [] [] | 8 + m4 | [] [] [] [] | 12 + make | [] [] [] [] [] [] | 12 + mysecretdiary | | 1 + nano | [] | 4 + opcodes | [] | 1 + parted | [] [] | 5 + ptx | [] [] [] [] [] [] [] [] | 15 + python | | 0 + recode | [] [] [] [] | 13 + sed | [] [] [] [] [] [] [] | 19 + sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 + sharutils | [] [] [] | 11 + sketch | | 0 + soundtracker | | 3 + sp | | 0 + tar | [] [] [] [] [] [] [] | 15 + texinfo | [] | 7 + textutils | [] [] [] [] [] [] [] [] | 16 + util-linux | [] [] | 4 + wdiff | [] [] [] [] | 7 + wget | [] [] [] [] [] [] [] | 17 + +----------------------------------------------------+ + 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + + Some counters in the preceding matrix are higher than the number of +visible blocks let us expect. This is because a few extra PO files are +used for implementing regional variants of languages, or language +dialects. + + For a PO file in the matrix above to be effective, the package to +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If September 2001 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + +Using `gettext' in new packages +=============================== + + If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +to use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. + diff --git a/popt/acconfig.h b/popt/acconfig.h index 10965f1..fc84c34 100644 --- a/popt/acconfig.h +++ b/popt/acconfig.h @@ -16,7 +16,7 @@ a given entry is in the file. Leave the following blank line there!! Autoheader needs it. */ -^L + /* Define to the name of the distribution. */ #undef PACKAGE @@ -27,25 +27,10 @@ /* Define to 1 if ANSI function prototypes are usable. */ #undef PROTOTYPES -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS - -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS - -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT - -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if you have the stpcpy function. */ -#undef HAVE_STPCPY - /* Absolute path to popt top_sourcedir. */ #undef POPT_SOURCE_PATH -^L + /* Leave that blank line there!! Autoheader needs it. If you're adding to this file, keep in mind: The entries are in sort -df order: alphabetical, case insensitive, diff --git a/popt/configure.in b/popt/configure.in index bb7fbfd..2910dd6 100755 --- a/popt/configure.in +++ b/popt/configure.in @@ -1,8 +1,9 @@ AC_INIT(popt.h) -AM_CONFIG_HEADER(config.h) -AC_PREREQ(2.12) AC_CANONICAL_SYSTEM +AC_PREREQ(2.12) AM_INIT_AUTOMAKE(popt, 1.7) +AM_CONFIG_HEADER(config.h) + ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312" AC_ISC_POSIX diff --git a/popt/depcomp b/popt/depcomp new file mode 100755 index 0000000..6589965 --- /dev/null +++ b/popt/depcomp @@ -0,0 +1,411 @@ +#! /bin/sh + +# depcomp - compile a program generating dependencies as side-effects +# Copyright 1999, 2000 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. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi +# `libtool' can also be set to `yes' or `no'. + +depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. This file always lives in the current directory. + # Also, the AIX compiler puts `$object:' at the start of each line; + # $object doesn't have directory information. + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + + tmpdepfile1="$object.d" + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then + "$@" -Wc,-MD + else + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + else + tmpdepfile="$tmpdepfile2" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a space and a tab in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + test -z "$dashmflag" && dashmflag=-M + ( IFS=" " + case " $* " in + *" --mode=compile "*) # this is libtool, let us make it quiet + for arg + do # cycle over the arguments + case "$arg" in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + # X makedepend + ( + shift + cleared=no + for arg in "$@"; do + case $cleared in no) + set ""; shift + cleared=yes + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift;; + -*) + ;; + *) + set fnord "$@" "$arg"; shift;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tail +3 "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 diff --git a/popt/install-sh b/popt/install-sh index 5871924..e9de238 100755 --- a/popt/install-sh +++ b/popt/install-sh @@ -1,15 +1,27 @@ -#! /bin/sh +#!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5. +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script @@ -106,6 +118,7 @@ if [ x"$dir_arg" != x ]; then if [ -d $dst ]; then instcmd=: + chmodcmd="" else instcmd=mkdir fi diff --git a/popt/intl/ChangeLog b/popt/intl/ChangeLog index df904de..84e2b37 100644 --- a/popt/intl/ChangeLog +++ b/popt/intl/ChangeLog @@ -1,4 +1,4 @@ -2001-05-23 GNU +2001-09-13 GNU - * Version 0.10.38 released. + * Version 0.10.40 released. diff --git a/popt/intl/Makefile.in b/popt/intl/Makefile.in index 889ba23..19ed4a7 100644 --- a/popt/intl/Makefile.in +++ b/popt/intl/Makefile.in @@ -1,19 +1,20 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. # Copyright (C) 1995-1998, 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) +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # -# You should have received a copy of the GNU 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. +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \ config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc +DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c # Libtool's library version information for libintl. @@ -184,7 +185,7 @@ install-data: all $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ - dists="$(DISTFILES.common)"; \ + dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \ for file in $$dists; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -243,7 +244,7 @@ uninstall: : ; \ fi if test "$(PACKAGE)" = "gettext"; then \ - for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \ + for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ diff --git a/popt/intl/VERSION b/popt/intl/VERSION index 268da64..cb8a01a 100644 --- a/popt/intl/VERSION +++ b/popt/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.38 +GNU gettext library from gettext-0.10.40 diff --git a/popt/intl/bindtextdom.c b/popt/intl/bindtextdom.c index 7e5a74a..c6a9bd1 100644 --- a/popt/intl/bindtextdom.c +++ b/popt/intl/bindtextdom.c @@ -1,19 +1,20 @@ /* Implementation of the bindtextdomain(3) function Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/config.charset b/popt/intl/config.charset index d6f3695..f4f2611 100755 --- a/popt/intl/config.charset +++ b/popt/intl/config.charset @@ -80,10 +80,10 @@ # EUC-KR glibc aix hpux irix osf solaris freebsd yes # EUC-TW glibc aix hpux irix osf solaris # BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5HKSCS glibc +# BIG5-HKSCS glibc # GBK aix osf win32 dos # GB18030 glibc -# SJIS hpux osf solaris freebsd +# SHIFT_JIS hpux osf solaris freebsd yes # JOHAB glibc win32 # TIS-620 glibc aix hpux osf solaris # VISCII glibc yes @@ -174,7 +174,7 @@ case "$os" in echo "eucTW EUC-TW" echo "hp15CN GB2312" #echo "ccdc ?" # what is this? - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "utf8 UTF-8" ;; irix*) @@ -209,7 +209,7 @@ case "$os" in echo "GBK GBK" echo "KSC5601 CP949" echo "sdeckanji EUC-JP" - echo "SJIS SJIS" + echo "SJIS SHIFT_JIS" echo "TACTIS TIS-620" echo "UTF-8 UTF-8" ;; @@ -230,7 +230,7 @@ case "$os" in echo "cns11643 EUC-TW" echo "5601 EUC-KR" echo "eucJP EUC-JP" - echo "PCK SJIS" + echo "PCK SHIFT_JIS" echo "TIS620.2533 TIS-620" #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" @@ -266,8 +266,8 @@ case "$os" in echo "zh_TW.Big5 BIG5" echo "zh_CN.EUC GB2312" echo "ja_JP.EUC EUC-JP" - echo "ja_JP.SJIS SJIS" - echo "ja_JP.Shift_JIS SJIS" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ja_JP.Shift_JIS SHIFT_JIS" echo "ko_KR.EUC EUC-KR" ;; beos*) diff --git a/popt/intl/dcgettext.c b/popt/intl/dcgettext.c index 469e78d..b7c9652 100644 --- a/popt/intl/dcgettext.c +++ b/popt/intl/dcgettext.c @@ -1,19 +1,20 @@ /* Implementation of the dcgettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/dcigettext.c b/popt/intl/dcigettext.c index 8456550..6acde19 100644 --- a/popt/intl/dcigettext.c +++ b/popt/intl/dcigettext.c @@ -1,19 +1,20 @@ /* Implementation of the internal dcigettext function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include @@ -517,6 +518,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) /* We cannot get the current working directory. Don't signal an error but simply return the default string. */ FREE_BLOCKS (block_list); + __libc_rwlock_unlock (_nl_state_lock); __set_errno (saved_errno); return (plural == 0 ? (char *) msgid1 diff --git a/popt/intl/dcngettext.c b/popt/intl/dcngettext.c index e5da257..c16af21 100644 --- a/popt/intl/dcngettext.c +++ b/popt/intl/dcngettext.c @@ -1,19 +1,20 @@ /* Implementation of the dcngettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/dgettext.c b/popt/intl/dgettext.c index c513041..3651207 100644 --- a/popt/intl/dgettext.c +++ b/popt/intl/dgettext.c @@ -1,19 +1,20 @@ /* Implementation of the dgettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/dngettext.c b/popt/intl/dngettext.c index 79aaa9a..f214e95 100644 --- a/popt/intl/dngettext.c +++ b/popt/intl/dngettext.c @@ -1,19 +1,20 @@ /* Implementation of the dngettext(3) function. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/explodename.c b/popt/intl/explodename.c index c4ddcc4..2985064 100644 --- a/popt/intl/explodename.c +++ b/popt/intl/explodename.c @@ -1,19 +1,20 @@ /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/finddomain.c b/popt/intl/finddomain.c index 4882554..2f103d5 100644 --- a/popt/intl/finddomain.c +++ b/popt/intl/finddomain.c @@ -2,19 +2,20 @@ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/gettext.c b/popt/intl/gettext.c index a640205..22a6c24 100644 --- a/popt/intl/gettext.c +++ b/popt/intl/gettext.c @@ -1,19 +1,20 @@ /* Implementation of gettext(3) function. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/gettext.h b/popt/intl/gettext.h index eb58890..6f5d760 100644 --- a/popt/intl/gettext.h +++ b/popt/intl/gettext.h @@ -1,19 +1,20 @@ /* Description of GNU message catalog format: general file layout. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _GETTEXT_H #define _GETTEXT_H 1 diff --git a/popt/intl/gettextP.h b/popt/intl/gettextP.h index ee8ca48..43de1cd 100644 --- a/popt/intl/gettextP.h +++ b/popt/intl/gettextP.h @@ -2,19 +2,20 @@ Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _GETTEXTP_H #define _GETTEXTP_H diff --git a/popt/intl/hash-string.h b/popt/intl/hash-string.h index 37d4ce1..ccb7acc 100644 --- a/popt/intl/hash-string.h +++ b/popt/intl/hash-string.h @@ -1,19 +1,20 @@ /* Description of GNU message catalog format: string hashing function. Copyright (C) 1995, 1997, 1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* @@ end of prolog @@ */ diff --git a/popt/intl/intl-compat.c b/popt/intl/intl-compat.c index b8edaa1..0a06ce9 100644 --- a/popt/intl/intl-compat.c +++ b/popt/intl/intl-compat.c @@ -2,19 +2,20 @@ Library. Copyright (C) 1995, 2000, 2001 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. */ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/l10nflist.c b/popt/intl/l10nflist.c index 557253e..533e94b 100644 --- a/popt/intl/l10nflist.c +++ b/popt/intl/l10nflist.c @@ -1,19 +1,20 @@ /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for stpcpy(). This must come before because may include diff --git a/popt/intl/libgettext.h b/popt/intl/libgettext.h index 553382c..c5be54a 100644 --- a/popt/intl/libgettext.h +++ b/popt/intl/libgettext.h @@ -1,19 +1,20 @@ /* Convenience header for conditional use of GNU . Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 diff --git a/popt/intl/libgnuintl.h b/popt/intl/libgnuintl.h index 577001a..f891deb 100644 --- a/popt/intl/libgnuintl.h +++ b/popt/intl/libgnuintl.h @@ -1,19 +1,20 @@ /* Message catalogs for internationalization. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LIBINTL_H #define _LIBINTL_H 1 diff --git a/popt/intl/libintl.h b/popt/intl/libintl.h deleted file mode 100644 index 3a92960..0000000 --- a/popt/intl/libintl.h +++ /dev/null @@ -1,182 +0,0 @@ -/* Message catalogs for internationalization. - Copyright (C) 1995, 1996, 1997, 1998 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. */ - -/* Because on some systems (e.g. Solaris) we sometimes have to include - the systems libintl.h as well as this file we have more complex - include protection above. But the systems header might perhaps also - define _LIBINTL_H and therefore we have to protect the definition here. */ - -#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -#ifndef _LIBINTL_H -# define _LIBINTL_H 1 -#endif -#define _LIBGETTEXT_H 1 - -/* We define an additional symbol to signal that we use the GNU - implementation of gettext. */ -#define __USE_GNU_GETTEXT 1 - -#include - -#if HAVE_LOCALE_H -# include -#endif - - -#ifdef __cplusplus -extern "C" { -#endif - -/* @@ end of prolog @@ */ - -#ifndef PARAMS -# if __STDC__ || defined __cplusplus -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -#ifndef NULL -# if !defined __cplusplus || defined __GNUC__ -# define NULL ((void *) 0) -# else -# define NULL (0) -# endif -#endif - -#if !HAVE_LC_MESSAGES -/* This value determines the behaviour of the gettext() and dgettext() - function. But some system does not have this defined. Define it - to a default value. */ -# define LC_MESSAGES (-1) -#endif - - -/* Declarations for gettext-using-catgets interface. Derived from - Jim Meyering's libintl.h. */ -struct _msg_ent -{ - const char *_msg; - int _msg_number; -}; - - -#if HAVE_CATGETS -/* These two variables are defined in the automatically by po-to-tbl.sed - generated file `cat-id-tbl.c'. */ -extern const struct _msg_ent _msg_tbl[]; -extern int _msg_tbl_length; -#endif - - -/* For automatical extraction of messages sometimes no real - translation is needed. Instead the string itself is the result. */ -#define gettext_noop(Str) (Str) - -/* Look up MSGID in the current default message catalog for the current - LC_MESSAGES locale. If not found, returns MSGID itself (the default - text). */ -extern char *gettext PARAMS ((const char *__msgid)); -extern char *gettext__ PARAMS ((const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current - LC_MESSAGES locale. */ -extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -extern char *dgettext__ PARAMS ((const char *__domainname, - const char *__msgid)); - -/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ -extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, - int __category)); -extern char *dcgettext__ PARAMS ((const char *__domainname, - const char *__msgid, int __category)); - - -/* Set the current default message catalog to DOMAINNAME. - If DOMAINNAME is null, return the current default. - If DOMAINNAME is "", reset to the default of "messages". */ -extern char *textdomain PARAMS ((const char *__domainname)); -extern char *textdomain__ PARAMS ((const char *__domainname)); - -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -extern char *bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *bindtextdomain__ PARAMS ((const char *__domainname, - const char *__dirname)); - -#if ENABLE_NLS - -/* Solaris 2.3 has the gettext function but dcgettext is missing. - So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 - has dcgettext. */ -# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) - -# define gettext(Msgid) \ - dgettext (NULL, Msgid) - -# define dgettext(Domainname, Msgid) \ - dcgettext (Domainname, Msgid, LC_MESSAGES) - -# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -/* This global variable is defined in loadmsgcat.c. We need a sign, - whether a new catalog was loaded, which can be associated with all - translations. */ -extern int _nl_msg_cat_cntr; - -# define dcgettext(Domainname, Msgid, Category) \ - (__extension__ \ - ({ \ - char *__result; \ - if (__builtin_constant_p (Msgid)) \ - { \ - static char *__translation__; \ - static int __catalog_counter__; \ - if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ - { \ - __translation__ = \ - dcgettext__ (Domainname, Msgid, Category); \ - __catalog_counter__ = _nl_msg_cat_cntr; \ - } \ - __result = __translation__; \ - } \ - else \ - __result = dcgettext__ (Domainname, Msgid, Category); \ - __result; \ - })) -# endif -# endif - -#else - -# define gettext(Msgid) (Msgid) -# define dgettext(Domainname, Msgid) (Msgid) -# define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) ((char *) Domainname) -# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) - -#endif - -/* @@ begin of epilog @@ */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/popt/intl/loadinfo.h b/popt/intl/loadinfo.h index 5171a8f..b861260 100644 --- a/popt/intl/loadinfo.h +++ b/popt/intl/loadinfo.h @@ -2,19 +2,20 @@ This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _LOADINFO_H #define _LOADINFO_H 1 diff --git a/popt/intl/loadmsgcat.c b/popt/intl/loadmsgcat.c index d589243..f99ebee 100644 --- a/popt/intl/loadmsgcat.c +++ b/popt/intl/loadmsgcat.c @@ -1,19 +1,20 @@ /* Load needed message catalogs. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include diff --git a/popt/intl/localcharset.c b/popt/intl/localcharset.c index 22e09e4..61f8f3e 100644 --- a/popt/intl/localcharset.c +++ b/popt/intl/localcharset.c @@ -75,13 +75,13 @@ /* Pointer to the contents of the charset.alias file, if it has already been read, else NULL. Its format is: ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static char * volatile charset_aliases; +static const char * volatile charset_aliases; /* Return a pointer to the contents of the charset.alias file. */ static const char * get_charset_aliases () { - char *cp; + const char *cp; cp = charset_aliases; if (cp == NULL) diff --git a/popt/intl/locale.alias b/popt/intl/locale.alias index 48940f7..bd7b9b3 100644 --- a/popt/intl/locale.alias +++ b/popt/intl/locale.alias @@ -1,19 +1,20 @@ # Locale name alias data base. # Copyright (C) 1996,1997,1998,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) +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # -# You should have received a copy of the GNU 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. +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. # The format of this file is the same as for the corresponding file of # the X Window System, which normally can be found in @@ -46,7 +47,7 @@ galego gl_ES.ISO-8859-1 galician gl_ES.ISO-8859-1 german de_DE.ISO-8859-1 greek el_GR.ISO-8859-7 -hebrew iw_IL.ISO-8859-8 +hebrew he_IL.ISO-8859-8 hrvatski hr_HR.ISO-8859-2 hungarian hu_HU.ISO-8859-2 icelandic is_IS.ISO-8859-1 diff --git a/popt/intl/localealias.c b/popt/intl/localealias.c index 76f19a9..91e7acc 100644 --- a/popt/intl/localealias.c +++ b/popt/intl/localealias.c @@ -1,19 +1,20 @@ /* Handle aliases for locale names. Copyright (C) 1995-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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* Tell glibc's to provide a prototype for mempcpy(). This must come before because may include diff --git a/popt/intl/ngettext.c b/popt/intl/ngettext.c index 8b1fa02..fb3ec5a 100644 --- a/popt/intl/ngettext.c +++ b/popt/intl/ngettext.c @@ -1,19 +1,20 @@ /* Implementation of ngettext(3) function. Copyright (C) 1995, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/intl/plural.c b/popt/intl/plural.c index 8191335..640d43c 100644 --- a/popt/intl/plural.c +++ b/popt/intl/plural.c @@ -23,19 +23,20 @@ Copyright (C) 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* The bison generated parser uses alloca. AIX 3 forces us to put this declaration at the beginning of the file. The declaration in bison's @@ -66,13 +67,13 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 52 "plural.y" +#line 53 "plural.y" typedef union { unsigned long int num; enum operator op; struct expression *exp; } YYSTYPE; -#line 58 "plural.y" +#line 59 "plural.y" /* Prototypes for local functions. */ static struct expression *new_exp PARAMS ((int nargs, enum operator op, @@ -234,8 +235,8 @@ static const short yyrhs[] = { 17, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 177, 185, 189, 193, 197, 201, 205, 209, 213, 217, - 221, 226 + 178, 186, 190, 194, 198, 202, 206, 210, 214, 218, + 222, 227 }; #endif @@ -845,7 +846,7 @@ yyreduce: switch (yyn) { case 1: -#line 178 "plural.y" +#line 179 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; @@ -853,68 +854,68 @@ case 1: ; break;} case 2: -#line 186 "plural.y" +#line 187 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 3: -#line 190 "plural.y" +#line 191 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 4: -#line 194 "plural.y" +#line 195 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 5: -#line 198 "plural.y" +#line 199 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 6: -#line 202 "plural.y" +#line 203 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 7: -#line 206 "plural.y" +#line 207 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 8: -#line 210 "plural.y" +#line 211 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 9: -#line 214 "plural.y" +#line 215 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); ; break;} case 10: -#line 218 "plural.y" +#line 219 "plural.y" { yyval.exp = new_exp_0 (var); ; break;} case 11: -#line 222 "plural.y" +#line 223 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; ; break;} case 12: -#line 227 "plural.y" +#line 228 "plural.y" { yyval.exp = yyvsp[-1].exp; ; @@ -1141,7 +1142,7 @@ yyerrhandle: } return 1; } -#line 232 "plural.y" +#line 233 "plural.y" void diff --git a/popt/intl/plural.y b/popt/intl/plural.y index 42ffa0e..be049a6 100644 --- a/popt/intl/plural.y +++ b/popt/intl/plural.y @@ -3,19 +3,20 @@ Copyright (C) 2000, 2001 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. - 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* The bison generated parser uses alloca. AIX 3 forces us to put this declaration at the beginning of the file. The declaration in bison's diff --git a/popt/intl/textdomain.c b/popt/intl/textdomain.c index 05c2fd7..2e420ad 100644 --- a/popt/intl/textdomain.c +++ b/popt/intl/textdomain.c @@ -1,19 +1,20 @@ /* Implementation of the textdomain(3) function. Copyright (C) 1995-1998, 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU 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. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include diff --git a/popt/missing b/popt/missing index cbe2b0e..0a7fb5a 100755 --- a/popt/missing +++ b/popt/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. +# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,37 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +70,15 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing 0.3 - GNU automake" ;; -*) @@ -61,7 +90,7 @@ Supported PROGRAM values: aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -70,7 +99,7 @@ WARNING: \`$1' is missing on your system. You should only need it if autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -79,29 +108,31 @@ WARNING: \`$1' is missing on your system. You should only need it if autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in` - if test -z "$files"; then - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in` - test -z "$files" || files="$files.in" - else - files=`echo "$files" | sed -e 's/:/ /g'` - fi - test -z "$files" && files="config.h.in" - touch $files + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files ;; automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print \ - | sed 's/^\(.*\).am$/touch \1.in/' \ - | sh + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done ;; bison|yacc) @@ -157,7 +188,32 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -173,6 +229,45 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff --git a/popt/mkinstalldirs b/popt/mkinstalldirs index d73a061..12ea679 100755 --- a/popt/mkinstalldirs +++ b/popt/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 1998/10/08 14:23:56 jbj Exp $ +# $Id: mkinstalldirs,v 1.2 2002/02/10 21:14:38 jbj Exp $ errstatus=0 @@ -22,7 +22,7 @@ do esac if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 + echo "mkdir $pathcomp" mkdir "$pathcomp" || lasterr=$? diff --git a/popt/po/ChangeLog b/popt/po/ChangeLog new file mode 100644 index 0000000..bc697cb --- /dev/null +++ b/popt/po/ChangeLog @@ -0,0 +1,6 @@ +2002-02-10 gettextize + + * Makefile.in.in: Upgrade to gettext-0.10.40. + * cat-id-tbl.c: Remove file. + * stamp-cat-id: Remove file. + diff --git a/popt/po/Makefile.in.in b/popt/po/Makefile.in.in index a11d0bb..32b7376 100644 --- a/popt/po/Makefile.in.in +++ b/popt/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper # # This file file be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License @@ -9,6 +9,10 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + SHELL = /bin/sh @SET_MAKE@ @@ -18,22 +22,20 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/gettext/po -subdir = po +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = PATH=../intl:$$PATH @GMSGFMT@ +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../intl:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../intl:$$PATH msgmerge +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -43,20 +45,17 @@ INCLUDES = -I.. -I$(top_srcdir)/intl COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \ -stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ +$(POFILES) $(GMOFILES) POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .c.o: $(COMPILE) $< @@ -70,98 +69,55 @@ INSTOBJEXT = @INSTOBJEXT@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< all: all-@USE_NLS@ -all-yes: cat-id-tbl.c $(CATALOGS) +all-yes: $(CATALOGS) all-no: -$(srcdir)/$(PACKAGE).pot: $(POTFILES) +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \ + --add-comments --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(PACKAGE).po \ || ( rm -f $(srcdir)/$(PACKAGE).pot \ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: -$(srcdir)/stamp-cat-id: $(PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ - | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -x "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + : ; \ fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ - *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ fi; \ done - if test "$(PACKAGE)" = "gettext"; then \ - if test -x "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi # Define this as empty until I found a useful application. installcheck: @@ -170,88 +126,68 @@ uninstall: catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done + if test "$(PACKAGE)" = "gettext"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi check: all -cat-id-tbl.o: ../intl/libgettext.h - dvi info tags TAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f $(GMOFILES) -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) dists="$(DISTFILES)"; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done update-po: Makefile $(MAKE) $(PACKAGE).pot - PATH=`pwd`/../intl:$$PATH; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ + catalogs='$(GMOFILES)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - mv $$lang.po $$lang.old.po; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ - rm -f $$lang.old.po; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ else \ echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ - mv $$lang.old.po $$lang.po; \ + rm -f $$lang.new.po; \ fi; \ done + $(MAKE) update-gmo -refresh-po: Makefile - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot > $$lang.pot ; then \ - echo "$(MSGMERGE) of $$lang succeeded" ; \ - mv -f $$lang.pot $$lang.po ; \ - else \ - echo "$(MSGMERGE) of $$lang failed" ; \ - rm -f $$lang.pot ; \ - fi \ - done +update-gmo: Makefile $(GMOFILES) + @: -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) - -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ +Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status diff --git a/python/Makefile.am b/python/Makefile.am index f70499c..59f68b1 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -34,10 +34,10 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c -rpmmodule.so: $(librpmmodule_la_OBJECTS) +rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) -poptmodule.so: $(poptmodule_so_OBJECTS) +poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS) $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS) .PHONY: lclint diff --git a/python/Makefile.in b/python/Makefile.in index dd66487..0bae1b6 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,8 +11,9 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Makefile for rpm library. +@SET_MAKE@ +# Makefile for rpm library. SHELL = @SHELL@ @@ -33,13 +35,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -48,11 +46,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -65,6 +63,7 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -81,6 +80,7 @@ CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DBLIBOBJS = @DBLIBOBJS@ DBLIBSRCS = @DBLIBSRCS@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ @@ -93,6 +93,7 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GZIPBIN = @GZIPBIN@ INCPATH = @INCPATH@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -110,7 +111,6 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALEDIR = @LOCALEDIR@ MACROFILES = @MACROFILES@ -MAKEINFO = @MAKEINFO@ MKDIR = @MKDIR@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -181,6 +181,9 @@ __SED = @__SED@ __SSH = @__SSH@ __STRIP = @__STRIP@ __TAR = @__TAR@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ libdb3 = @libdb3@ libdb3a = @libdb3a@ testdir = @testdir@ @@ -222,91 +225,53 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c +subdir = python mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) - +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) + +librpmmodule_la_LDFLAGS = +librpmmodule_la_LIBADD = +am_librpmmodule_la_OBJECTS = rpmmodule.lo hash.lo upgrade.lo +librpmmodule_la_OBJECTS = $(am_librpmmodule_la_OBJECTS) +python_PROGRAMS = rpmmodule.so$(EXEEXT) poptmodule.so$(EXEEXT) +PROGRAMS = $(python_PROGRAMS) + +am_poptmodule_so_OBJECTS = poptmodule.$(OBJEXT) +poptmodule_so_OBJECTS = $(am_poptmodule_so_OBJECTS) +poptmodule_so_LDADD = $(LDADD) +poptmodule_so_DEPENDENCIES = +am_rpmmodule_so_OBJECTS = +rpmmodule_so_OBJECTS = $(am_rpmmodule_so_OBJECTS) +rpmmodule_so_LDADD = $(LDADD) +rpmmodule_so_DEPENDENCIES = -DEFS = @DEFS@ -I. -I$(srcdir) -I.. +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -librpmmodule_la_LDFLAGS = -librpmmodule_la_LIBADD = -librpmmodule_la_OBJECTS = rpmmodule.lo hash.lo upgrade.lo -python_PROGRAMS = rpmmodule.so poptmodule.so -PROGRAMS = $(python_PROGRAMS) - -rpmmodule_so_OBJECTS = -rpmmodule_so_LDADD = $(LDADD) -rpmmodule_so_DEPENDENCIES = -poptmodule_so_OBJECTS = poptmodule.$(OBJEXT) -poptmodule_so_LDADD = $(LDADD) -poptmodule_so_DEPENDENCIES = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LIBS = @LIBS@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/hash.Plo $(DEPDIR)/poptmodule.Po \ +@AMDEP_TRUE@ $(DEPDIR)/rpmmodule.Plo $(DEPDIR)/upgrade.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = ChangeLog Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(librpmmodule_la_SOURCES) $(poptmodule_so_SOURCES) \ + $(rpmmodule_so_SOURCES) +DIST_COMMON = ChangeLog Makefile.am Makefile.in +SOURCES = $(librpmmodule_la_SOURCES) $(poptmodule_so_SOURCES) $(rpmmodule_so_SOURCES) -TAR = gtar -GZIP_ENV = --best -DEP_FILES = .deps/hash.P .deps/poptmodule.P .deps/rpmmodule.P \ -.deps/upgrade.P -SOURCES = $(librpmmodule_la_SOURCES) $(rpmmodule_so_SOURCES) $(poptmodule_so_SOURCES) -OBJECTS = $(librpmmodule_la_OBJECTS) $(rpmmodule_so_OBJECTS) $(poptmodule_so_OBJECTS) +all: all-am -all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign python/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstLTLIBRARIES: - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - -distclean-noinstLTLIBRARIES: - -maintainer-clean-noinstLTLIBRARIES: - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< +.SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo @@ -315,211 +280,222 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign python/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status -maintainer-clean-libtool: - -librpmmodule.la: $(librpmmodule_la_OBJECTS) $(librpmmodule_la_DEPENDENCIES) +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +librpmmodule.la: $(librpmmodule_la_OBJECTS) $(librpmmodule_la_DEPENDENCIES) $(LINK) $(librpmmodule_la_LDFLAGS) $(librpmmodule_la_OBJECTS) $(librpmmodule_la_LIBADD) $(LIBS) - -mostlyclean-pythonPROGRAMS: - -clean-pythonPROGRAMS: - -test -z "$(python_PROGRAMS)" || rm -f $(python_PROGRAMS) - -distclean-pythonPROGRAMS: - -maintainer-clean-pythonPROGRAMS: - install-pythonPROGRAMS: $(python_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pythondir) @list='$(python_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pythondir)/$$f; \ else :; fi; \ done uninstall-pythonPROGRAMS: @$(NORMAL_UNINSTALL) - list='$(python_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pythondir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + @list='$(python_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(pythondir)/$$f"; \ + rm -f $(DESTDIR)$(pythondir)/$$f; \ done +clean-pythonPROGRAMS: + -test -z "$(python_PROGRAMS)" || rm -f $(python_PROGRAMS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/poptmodule.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmmodule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/upgrade.Plo@am__quote@ + +distclean-depend: + -rm -rf $(DEPDIR) + +.c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + +.c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` + +.c.lo: +@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ +uninstall-info-am: + tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(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; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - -mostlyclean-tags: + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = python +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign python/Makefile @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) - -mostlyclean-depend: - -clean-depend: - -distclean-depend: - -rm -rf .deps - -maintainer-clean-depend: - -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) -install-data-am: install-pythonPROGRAMS -install-data: install-data-am +installdirs: + $(mkinstalldirs) $(DESTDIR)$(pythondir) -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-pythonPROGRAMS +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(pythondir) +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-pythonPROGRAMS \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-pythonPROGRAMS mostlyclean-am -clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ - clean-pythonPROGRAMS clean-tags clean-depend \ - clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags -distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ - distclean-libtool distclean-pythonPROGRAMS \ - distclean-tags distclean-depend distclean-generic \ - clean-am - -rm -f libtool +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-pythonPROGRAMS maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: install-pythonPROGRAMS + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool mostlyclean-pythonPROGRAMS \ -distclean-pythonPROGRAMS clean-pythonPROGRAMS \ -maintainer-clean-pythonPROGRAMS uninstall-pythonPROGRAMS \ -install-pythonPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -rpmmodule.so: $(librpmmodule_la_OBJECTS) +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-info-am uninstall-pythonPROGRAMS + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-pythonPROGRAMS \ + distclean distclean-compile distclean-depend distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-pythonPROGRAMS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am uninstall-pythonPROGRAMS + + +rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) -poptmodule.so: $(poptmodule_so_OBJECTS) +poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS) $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS) .PHONY: lclint lclint: lclint $(DEFS) $(INCLUDES) $(librpmmodule_la_SOURCES) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/rpm.spec b/rpm.spec index abd76e9..d5e3662 100644 --- a/rpm.spec +++ b/rpm.spec @@ -645,3 +645,4 @@ fi - query/verify by install transaction id. - rpm-4.0.4 release candidate. - add cpanflute2, another perl.req fiddle. +- make peace with gcc-3.1, remove compiler cruft. diff --git a/rpm.spec.in b/rpm.spec.in index 44cd256..b1898f2 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -646,3 +646,4 @@ fi - rpm-4.0.4 release candidate. - add cpanflute2, another perl.req fiddle. - make peace with gcc-3.1, remove compiler cruft. +- make peace with automake et al in 8.0, ugh. diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index 5cf794d..8df017d 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -28,7 +28,7 @@ LIBS = DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs) lib_LTLIBRARIES = librpmdb.la -librpmdb_la_SOURCES = $(DBLIBSRCS) \ +librpmdb_la_SOURCES = \ dbconfig.c fprint.c \ hdrNVR.c header.c header_internal.c legacy.c \ poptDB.c rpmhash.c rpmdb.c \ diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index b488ccf..394ad70 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -51,18 +51,18 @@ clean-local: rm -f $(BEECRYPTLOBJS) *.o .created tdigest_SOURCES = tdigest.c -tdigest_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la +tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la trpmio_SOURCES = trpmio.c -trpmio_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la tkey_SOURCES = tkey.c tkey_LDFLAGS = -all-static -tkey_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la +tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la tring_SOURCES = tring.c tring_LDFLAGS = -all-static -tring_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la +tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la dumpasn1_SOURCES = dumpasn1.c diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 05de276..91201c7 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.5 from Makefile.am. -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ SHELL = @SHELL@ @@ -31,13 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ @@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -63,20 +61,26 @@ host_alias = @host_alias@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ +AMTAR = @AMTAR@ AS = @AS@ +AWK = @AWK@ CC = @CC@ +DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ AUTOMAKE_OPTIONS = 1.4 foreign @@ -106,337 +110,334 @@ example_LDFLAGS = -L. -lz minigzip_SOURCES = minigzip.c minigzip_LDFLAGS = -L. -lz +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -CONFIG_CLEAN_FILES = Doxyfile -LTLIBRARIES = $(noinst_LTLIBRARIES) - +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = Doxyfile +LTLIBRARIES = $(noinst_LTLIBRARIES) + +libz_la_LDFLAGS = +libz_la_LIBADD = +am_libz_la_OBJECTS = adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo \ + deflate.lo trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo \ + infutil.lo inffast.lo +libz_la_OBJECTS = $(am_libz_la_OBJECTS) +noinst_PROGRAMS = example$(EXEEXT) minigzip$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) + +am_example_OBJECTS = example.$(OBJEXT) +example_OBJECTS = $(am_example_OBJECTS) +example_LDADD = $(LDADD) +example_DEPENDENCIES = +am_minigzip_OBJECTS = minigzip.$(OBJEXT) +minigzip_OBJECTS = $(am_minigzip_OBJECTS) +minigzip_LDADD = $(LDADD) +minigzip_DEPENDENCIES = -DEFS = @DEFS@ -I. -I$(srcdir) +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libz_la_LDFLAGS = -libz_la_LIBADD = -libz_la_OBJECTS = adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo \ -deflate.lo trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo \ -infutil.lo inffast.lo -noinst_PROGRAMS = example$(EXEEXT) minigzip$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - -example_OBJECTS = example.$(OBJEXT) -example_LDADD = $(LDADD) -example_DEPENDENCIES = -minigzip_OBJECTS = minigzip.$(OBJEXT) -minigzip_LDADD = $(LDADD) -minigzip_DEPENDENCIES = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +depcomp = $(SHELL) $(top_srcdir)/depcomp +@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/adler32.Plo $(DEPDIR)/compress.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/crc32.Plo $(DEPDIR)/deflate.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/example.Po $(DEPDIR)/gzio.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/infblock.Plo $(DEPDIR)/inffast.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/inflate.Plo $(DEPDIR)/inftrees.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/infutil.Plo $(DEPDIR)/minigzip.Po \ +@AMDEP_TRUE@ $(DEPDIR)/trees.Plo $(DEPDIR)/uncompr.Plo \ +@AMDEP_TRUE@ $(DEPDIR)/zutil.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(noinst_HEADERS) - -DIST_COMMON = README ChangeLog Doxyfile.in Makefile.am Makefile.in \ -aclocal.m4 configure configure.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libz_la_SOURCES) $(example_SOURCES) $(minigzip_SOURCES) +HEADERS = $(noinst_HEADERS) -TAR = gtar -GZIP_ENV = --best -DEP_FILES = .deps/adler32.P .deps/compress.P .deps/crc32.P \ -.deps/deflate.P .deps/example.P .deps/gzio.P .deps/infblock.P \ -.deps/inffast.P .deps/inflate.P .deps/inftrees.P .deps/infutil.P \ -.deps/minigzip.P .deps/trees.P .deps/uncompr.P .deps/zutil.P +DIST_COMMON = README $(noinst_HEADERS) ChangeLog Doxyfile.in \ + Makefile.am Makefile.in aclocal.m4 config.guess config.sub \ + configure configure.in depcomp install-sh ltmain.sh missing \ + mkinstalldirs SOURCES = $(libz_la_SOURCES) $(example_SOURCES) $(minigzip_SOURCES) -OBJECTS = $(libz_la_OBJECTS) $(example_OBJECTS) $(minigzip_OBJECTS) -all: all-redirect +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + .SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile +.SUFFIXES: .c .lo .o .obj -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +mostlyclean-libtool: + -rm -f *.lo -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) +clean-libtool: + -rm -rf .libs _libs -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +distclean-libtool: + -rm -f libtool +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$@ $(SHELL) ./config.status + +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -Doxyfile: $(top_builddir)/config.status Doxyfile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-noinstLTLIBRARIES: +$(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +Doxyfile: $(top_builddir)/config.status Doxyfile.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +libz.la: $(libz_la_OBJECTS) $(libz_la_DEPENDENCIES) + $(LINK) $(libz_la_LDFLAGS) $(libz_la_OBJECTS) $(libz_la_LIBADD) $(LIBS) -distclean-noinstLTLIBRARIES: - -maintainer-clean-noinstLTLIBRARIES: - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) + @rm -f example$(EXEEXT) + $(LINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS) +minigzip$(EXEEXT): $(minigzip_OBJECTS) $(minigzip_DEPENDENCIES) + @rm -f minigzip$(EXEEXT) + $(LINK) $(minigzip_LDFLAGS) $(minigzip_OBJECTS) $(minigzip_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c -maintainer-clean-compile: - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -libz.la: $(libz_la_OBJECTS) $(libz_la_DEPENDENCIES) - $(LINK) $(libz_la_LDFLAGS) $(libz_la_OBJECTS) $(libz_la_LIBADD) $(LIBS) - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/adler32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/compress.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/crc32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/deflate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gzio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/infblock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inffast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inflate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inftrees.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/infutil.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minigzip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/trees.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uncompr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zutil.Plo@am__quote@ -distclean-noinstPROGRAMS: +distclean-depend: + -rm -rf $(DEPDIR) -maintainer-clean-noinstPROGRAMS: +.c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) - @rm -f example$(EXEEXT) - $(LINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS) +.c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` -minigzip$(EXEEXT): $(minigzip_OBJECTS) $(minigzip_DEPENDENCIES) - @rm -f minigzip$(EXEEXT) - $(LINK) $(minigzip_LDFLAGS) $(minigzip_OBJECTS) $(minigzip_LDADD) $(LIBS) +.c.lo: +@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ +uninstall-info-am: tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(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; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ + list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -mostlyclean-tags: - -clean-tags: +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -maintainer-clean-tags: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +top_distdir = . +# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) + +GZIP_ENV = --best + +distdir: $(DISTFILES) + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + mkdir $(distdir) + $(mkinstalldirs) $(distdir)/. $(distdir)/amiga $(distdir)/contrib $(distdir)/msdos $(distdir)/nt $(distdir)/os2 + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + -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 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(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 - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz + -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(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 - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ + chmod a-w $(distdir) + dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile - $(mkinstalldirs) $(distdir)/amiga $(distdir)/contrib $(distdir)/msdos \ - $(distdir)/nt $(distdir)/os2 - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) - -mostlyclean-depend: - -clean-depend: - -distclean-depend: - -rm -rf .deps - -maintainer-clean-depend: - -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp -info-am: -info: info-am -dvi-am: -dvi: dvi-am + && $(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 \ + && 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) + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-noinstPROGRAMS \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS mostlyclean-am -clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ - clean-noinstPROGRAMS clean-tags clean-depend \ - clean-generic 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 +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags -clean: clean-am +dvi: dvi-am -distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ - distclean-libtool distclean-noinstPROGRAMS \ - distclean-tags distclean-depend distclean-generic \ - clean-am - -rm -f libtool +dvi-am: -distclean: distclean-am - -rm -f config.status - -maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f config.status - -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ -distclean-noinstPROGRAMS clean-noinstPROGRAMS \ -maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -distclean-depend clean-depend maintainer-clean-depend info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS dist \ + dist-all distcheck distclean distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am .PHONY: sources @@ -452,7 +453,6 @@ doxygen apidocs: Doxyfile rm -rf $@ mkdir -p $@ doxygen - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4 index d5ac365..326729c 100644 --- a/zlib/aclocal.m4 +++ b/zlib/aclocal.m4 @@ -1,70 +1,133 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +# aclocal.m4 generated automatically by aclocal 1.5 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# 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. -# serial 1 +# serial 5 -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# 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])])]) + + +# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) +# ---------------------------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -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_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi + +# Define the identity of the package. +PACKAGE=$1 +AC_SUBST(PACKAGE)dnl +VERSION=$2 +AC_SUBST(VERSION)dnl ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) +[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) + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# 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_DEPENDENCIES(CC)], + [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 +]) # # Check to make sure that the build environment is sane. # +# serial 3 + +# AM_SANITY_CHECK +# --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -74,7 +137,7 @@ if ( alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -83,28 +146,355 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. + +# serial 2 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1="$3/missing $2" - AC_MSG_RESULT(missing) + am_missing_run= + am_backtick='`' + AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) fi -AC_SUBST($1)]) +]) + +# AM_AUX_DIR_EXPAND + +# 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/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], [ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` +]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +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)]) + +# 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 +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# 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 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# serial 4 -*- Autoconf -*- + + + +# 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, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# --------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX" 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 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +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], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + 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 && + 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 + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" +AC_SUBST([$1DEPMODE]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[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_SUBST(DEPDIR) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +pushdef([subst], defn([AC_SUBST])) +subst(AMDEPBACKSLASH) +popdef([subst]) +]) + +# Generate code to set up dependency tracking. +# This macro should only be invoked once -- use via AC_REQUIRE. +# Usage: +# AM_OUTPUT_DEPENDENCY_COMMANDS + +# +# 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 + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +], [AMDEP_TRUE="$AMDEP_TRUE" +ac_aux_dir="$ac_aux_dir"])]) + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +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__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# 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 + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +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_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) + +# serial 3 + +# 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 +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -230,9 +620,30 @@ _LT_AC_LTCONFIG_HACK ]) +# AC_LIBTOOL_HEADER_ASSERT +# ------------------------ +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], +[AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + +if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) +fi +])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, +AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN @@ -250,10 +661,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. -[symcode='[BCDEGRST]'] +symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' @@ -261,25 +672,29 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +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'" + # Define system-specific variables. case $host_os in aix*) - [symcode='[BCDT]'] + symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' ;; 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*) - [symcode='[BCDEGRST]'] + symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) - [symcode='[BDT]'] + symcode='[[BDT]]' ;; sysv4) - [symcode='[DFNSTU]'] + symcode='[[DFNSTU]]' ;; esac @@ -293,14 +708,14 @@ esac # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -342,23 +757,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } -[lt_preloaded_symbols[] =] +lt_preloaded_symbols[[]] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -402,10 +817,13 @@ done global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) @@ -423,16 +841,17 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will find an echo command which doesn;t interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) + [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. @@ -498,7 +917,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -587,7 +1006,7 @@ AC_DIVERT_POP # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else @@ -674,7 +1093,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -696,16 +1115,22 @@ else ;; *) - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen", - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load", - [AC_CHECK_LIB(svld, dlopen, - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB(dld, shl_load, - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) ]) - ]) - ]) + ]) + ]) ]) ;; esac @@ -768,10 +1193,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. @@ -840,8 +1265,15 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. @@ -861,7 +1293,7 @@ rmdir .libs 2>/dev/null AC_MSG_RESULT($objdir) -AC_ARG_WITH(pic, +AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default @@ -889,7 +1321,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -924,13 +1356,13 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -986,9 +1418,9 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, 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' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -1055,7 +1487,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no @@ -1131,6 +1563,8 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo AC_TRY_COMPILE([], [int some_variable = 0;], [dnl # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -1140,6 +1574,7 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=yes fi ]) + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" ]) compiler_o_lo=$lt_cv_compiler_o_lo @@ -1236,7 +1671,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -1244,7 +1679,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -1331,7 +1768,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -1344,24 +1781,24 @@ EOF # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # 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 - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \[$]# in + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -1456,80 +1893,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # 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 + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[[012]]|aix4.[[012]].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok' - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -1561,11 +2014,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[[012]]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 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='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + 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' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -1640,7 +2100,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -1648,10 +2108,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case "$host_os" in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -1696,10 +2170,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -1708,7 +2211,7 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in - [solaris2.[0-5] | solaris2.[0-5].*]) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac @@ -1731,7 +2234,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + 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' @@ -1888,22 +2391,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - [ aix4 | aix4.[01] | aix4.[01].*)] - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -1912,14 +2417,13 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -1950,7 +2454,7 @@ cygwin* | mingw* | pw32*) case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ @@ -1960,14 +2464,14 @@ cygwin* | mingw* | pw32*) $rm \$dlpath' ;; yes,mingw*) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + 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"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' @@ -2125,9 +2629,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -2238,6 +2752,33 @@ test "$dynamic_linker" = no && can_build_shared=no AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no @@ -2331,6 +2872,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -2397,12 +2939,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -2568,6 +3110,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -2690,9 +3235,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -3047,6 +3592,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -3060,8 +3606,8 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] + [[\\/]]* | [[A-Za-z]]:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do @@ -3085,7 +3631,7 @@ else fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -3149,7 +3695,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -3164,7 +3710,7 @@ beos*) ;; bsdi4*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3178,7 +3724,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.[012]) + rhapsody* | darwin1.[[012]]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -3193,7 +3739,7 @@ freebsd*) i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3208,7 +3754,7 @@ gnu*) ;; hpux10.20*|hpux11*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; @@ -3227,7 +3773,7 @@ irix5* | irix6*) *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` @@ -3236,30 +3782,34 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] - esac + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -3276,14 +3826,14 @@ solaris*) lt_cv_file_magic_test_file=/lib/libc.so ;; -[sysv5uw[78]* | sysv4*uw2*)] +sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) @@ -3291,11 +3841,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ;; sequent) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] + 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 ;; esac @@ -3309,13 +3859,14 @@ deplibs_check_method=$lt_cv_deplibs_check_method # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl +AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm diff --git a/zlib/configure.in b/zlib/configure.in index 6bef28b..fdaf04d 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -1,6 +1,5 @@ AC_INIT(gzio.c) AC_CANONICAL_SYSTEM - AM_INIT_AUTOMAKE(zlib, 1.1.3) dnl Check for programs. diff --git a/zlib/depcomp b/zlib/depcomp new file mode 100755 index 0000000..6589965 --- /dev/null +++ b/zlib/depcomp @@ -0,0 +1,411 @@ +#! /bin/sh + +# depcomp - compile a program generating dependencies as side-effects +# Copyright 1999, 2000 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. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi +# `libtool' can also be set to `yes' or `no'. + +depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> $depfile + echo >> $depfile + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> $depfile + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. This file always lives in the current directory. + # Also, the AIX compiler puts `$object:' at the start of each line; + # $object doesn't have directory information. + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + outname="$stripped.o" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 AIX compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + + tmpdepfile1="$object.d" + tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then + "$@" -Wc,-MD + else + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + else + tmpdepfile="$tmpdepfile2" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a space and a tab in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + test -z "$dashmflag" && dashmflag=-M + ( IFS=" " + case " $* " in + *" --mode=compile "*) # this is libtool, let us make it quiet + for arg + do # cycle over the arguments + case "$arg" in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + # X makedepend + ( + shift + cleared=no + for arg in "$@"; do + case $cleared in no) + set ""; shift + cleared=yes + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift;; + -*) + ;; + *) + set fnord "$@" "$arg"; shift;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tail +3 "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + ( IFS=" " + case " $* " in + *" --mode=compile "*) + for arg + do # cycle over the arguments + case $arg in + "--mode=compile") + # insert --quiet before "--mode=compile" + set fnord "$@" --quiet + shift # fnord + ;; + esac + set fnord "$@" "$arg" + shift # fnord + shift # "$arg" + done + ;; + esac + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + ) & + proc=$! + "$@" + stat=$? + wait "$proc" + if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 diff --git a/zlib/ltmain.sh b/zlib/ltmain.sh new file mode 100644 index 0000000..1113682 --- /dev/null +++ b/zlib/ltmain.sh @@ -0,0 +1,5009 @@ +# ltmain.sh - Provide generalized library-building support services. +# NOTE: Changing this file will not affect anything until you rerun configure. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Check that we have a working $echo. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : +else + # Restart under the correct shell, and then maybe $echo will work. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 +fi + +# Global variables. +mode=$default_mode +nonopt= +prev= +prevopt= +run= +show="$echo" +show_help= +execute_dlfiles= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" + +# Parse our command line options once, thoroughly. +while test $# -gt 0 +do + arg="$1" + shift + + case $arg in + -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + execute_dlfiles) + execute_dlfiles="$execute_dlfiles $arg" + ;; + *) + eval "$prev=\$arg" + ;; + esac + + prev= + prevopt= + continue + fi + + # Have we seen a non-optional argument yet? + case $arg in + --help) + show_help=yes + ;; + + --version) + echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + exit 0 + ;; + + --config) + sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 + exit 0 + ;; + + --debug) + echo "$progname: enabling shell trace mode" + set -x + ;; + + --dry-run | -n) + run=: + ;; + + --features) + echo "host: $host" + if test "$build_libtool_libs" = yes; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + exit 0 + ;; + + --finish) mode="finish" ;; + + --mode) prevopt="--mode" prev=mode ;; + --mode=*) mode="$optarg" ;; + + --quiet | --silent) + show=: + ;; + + -dlopen) + prevopt="-dlopen" + prev=execute_dlfiles + ;; + + -*) + $echo "$modename: unrecognized option \`$arg'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + + *) + nonopt="$arg" + break + ;; + esac +done + +if test -n "$prevopt"; then + $echo "$modename: option \`$prevopt' requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 +fi + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + +if test -z "$show_help"; then + + # Infer the operation mode. + if test -z "$mode"; then + case $nonopt in + *cc | *++ | gcc* | *-gcc*) + mode=link + for arg + do + case $arg in + -c) + mode=compile + break + ;; + esac + done + ;; + *db | *dbx | *strace | *truss) + mode=execute + ;; + *install*|cp|mv) + mode=install + ;; + *rm) + mode=uninstall + ;; + *) + # If we have no mode, but dlfiles were specified, then do execute mode. + test -n "$execute_dlfiles" && mode=execute + + # Just use the default operation mode. + if test -z "$mode"; then + if test -n "$nonopt"; then + $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 + else + $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 + fi + fi + ;; + esac + fi + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + $echo "$modename: unrecognized option \`-dlopen'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$modename --help --mode=$mode' for more information." + + # These modes are in order of execution frequency so that they run quickly. + case $mode in + # libtool compile mode + compile) + modename="$modename: compile" + # Get the compilation command and the source file. + base_compile= + prev= + lastarg= + srcfile="$nonopt" + suppress_output= + + user_target=no + for arg + do + case $prev in + "") ;; + xcompiler) + # Aesthetically quote the previous argument. + prev= + lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + + case $arg in + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + + # Add the previous argument to base_compile. + if test -z "$base_compile"; then + base_compile="$lastarg" + else + base_compile="$base_compile $lastarg" + fi + continue + ;; + esac + + # Accept any command-line options. + case $arg in + -o) + if test "$user_target" != "no"; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 + exit 1 + fi + user_target=next + ;; + + -static) + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Wc,*) + args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + lastarg="$lastarg $arg" + done + IFS="$save_ifs" + lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + + # Add the arguments to base_compile. + if test -z "$base_compile"; then + base_compile="$lastarg" + else + base_compile="$base_compile $lastarg" + fi + continue + ;; + esac + + case $user_target in + next) + # The next one is the -o target name + user_target=yes + continue + ;; + yes) + # We got the output file + user_target=set + libobj="$arg" + continue + ;; + esac + + # Accept the current argument as the source file. + lastarg="$srcfile" + srcfile="$arg" + + # Aesthetically quote the previous argument. + + # Backslashify any backslashes, double quotes, and dollar signs. + # These are the only characters that are still specially + # interpreted inside of double-quoted scrings. + lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` + + # Double-quote args containing other shell metacharacters. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + case $lastarg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + lastarg="\"$lastarg\"" + ;; + esac + + # Add the previous argument to base_compile. + if test -z "$base_compile"; then + base_compile="$lastarg" + else + base_compile="$base_compile $lastarg" + fi + done + + case $user_target in + set) + ;; + no) + # Get the name of the library object. + libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + ;; + *) + $echo "$modename: you must specify a target with \`-o'" 1>&2 + exit 1 + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + xform='[cCFSfmso]' + case $libobj in + *.ada) xform=ada ;; + *.adb) xform=adb ;; + *.ads) xform=ads ;; + *.asm) xform=asm ;; + *.c++) xform=c++ ;; + *.cc) xform=cc ;; + *.cpp) xform=cpp ;; + *.cxx) xform=cxx ;; + *.f90) xform=f90 ;; + *.for) xform=for ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` + + case $libobj in + *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *) + $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 + exit 1 + ;; + esac + + if test -z "$base_compile"; then + $echo "$modename: you must specify a compilation command" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then + removelist="$obj $libobj" + else + removelist="$libobj" + fi + + $run $rm $removelist + trap "$run $rm $removelist; exit 1" 1 2 15 + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2*) + pic_mode=default + ;; + esac + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then + output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + removelist="$removelist $output_obj $lockfile" + trap "$run $rm $removelist; exit 1" 1 2 15 + else + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then + until $run ln "$0" "$lockfile" 2>/dev/null; do + $show "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then + echo "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 + fi + echo $srcfile > "$lockfile" + fi + + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then + # All platforms use -DPIC, to notify preprocessed assembler code. + command="$base_compile $srcfile $pic_flag -DPIC" + else + # Don't build PIC code + command="$base_compile $srcfile" + fi + if test "$build_old_libs" = yes; then + lo_libobj="$libobj" + dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$dir" = "X$libobj"; then + dir="$objdir" + else + dir="$dir/$objdir" + fi + libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` + + if test -d "$dir"; then + $show "$rm $libobj" + $run $rm $libobj + else + $show "$mkdir $dir" + $run $mkdir $dir + status=$? + if test $status -ne 0 && test ! -d $dir; then + exit $status + fi + fi + fi + if test "$compiler_o_lo" = yes; then + output_obj="$libobj" + command="$command -o $output_obj" + elif test "$compiler_c_o" = yes; then + output_obj="$obj" + command="$command -o $output_obj" + fi + + $run $rm "$output_obj" + $show "$command" + if $run eval "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit 1 + fi + + if test "$need_locks" = warn && + test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then + echo "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 + fi + + # Just move the object if needed, then go on to compile the next one + if test x"$output_obj" != x"$libobj"; then + $show "$mv $output_obj $libobj" + if $run $mv $output_obj $libobj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + fi + + # If we have no pic_flag, then copy the object into place and finish. + if (test -z "$pic_flag" || test "$pic_mode" != default) && + test "$build_old_libs" = yes; then + # Rename the .lo from within objdir to obj + if test -f $obj; then + $show $rm $obj + $run $rm $obj + fi + + $show "$mv $libobj $obj" + if $run $mv $libobj $obj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` + libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` + # Now arrange that obj and lo_libobj become the same file + $show "(cd $xdir && $LN_S $baseobj $libobj)" + if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi + exit 0 + else + error=$? + $run $rm $removelist + exit $error + fi + fi + + # Allow error messages only from the first compilation. + suppress_output=' >/dev/null 2>&1' + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code + command="$base_compile $srcfile" + else + # All platforms use -DPIC, to notify preprocessed assembler code. + command="$base_compile $srcfile $pic_flag -DPIC" + fi + if test "$compiler_c_o" = yes; then + command="$command -o $obj" + output_obj="$obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + command="$command$suppress_output" + $run $rm "$output_obj" + $show "$command" + if $run eval "$command"; then : + else + $run $rm $removelist + exit 1 + fi + + if test "$need_locks" = warn && + test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then + echo "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 + fi + + # Just move the object if needed + if test x"$output_obj" != x"$obj"; then + $show "$mv $output_obj $obj" + if $run $mv $output_obj $obj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + fi + + # Create an invalid libtool object if no PIC, so that we do not + # accidentally link it into a program. + if test "$build_libtool_libs" != yes; then + $show "echo timestamp > $libobj" + $run eval "echo timestamp > \$libobj" || exit $? + else + # Move the .lo from within objdir + $show "$mv $libobj $lo_libobj" + if $run $mv $libobj $lo_libobj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + fi + fi + + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $run $rm "$lockfile" + fi + + exit 0 + ;; + + # libtool link mode + link | relink) + modename="$modename: link" + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invokation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args="$nonopt" + compile_command="$nonopt" + finalize_command="$nonopt" + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + + avoid_version=no + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -all-static | -static) + if test "X$arg" = "X-all-static"; then + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + else + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + fi + build_libtool_libs=no + build_old_libs=yes + prefer_static_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test $# -gt 0; do + arg="$1" + shift + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test + ;; + *) qarg=$arg ;; + esac + libtool_args="$libtool_args $qarg" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + compile_command="$compile_command @OUTPUT@" + finalize_command="$finalize_command @OUTPUT@" + ;; + esac + + case $prev in + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + compile_command="$compile_command @SYMFILE@" + finalize_command="$finalize_command @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + else + dlprefiles="$dlprefiles $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols="$arg" + if test ! -f "$arg"; then + $echo "$modename: symbol file \`$arg' does not exist" + exit 1 + fi + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 + exit 1 + ;; + esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) rpath="$rpath $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) xrpath="$xrpath $arg" ;; + esac + fi + prev= + continue + ;; + xcompiler) + compiler_flags="$compiler_flags $qarg" + prev= + compile_command="$compile_command $qarg" + finalize_command="$finalize_command $qarg" + continue + ;; + xlinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" + prev= + compile_command="$compile_command $wl$qarg" + finalize_command="$finalize_command $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n $prev + + prevarg="$arg" + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" + finalize_command="$finalize_command $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 + continue + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + $echo "$modename: more than one -exported-symbols argument is not allowed" + exit 1 + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix*) + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + ;; + esac + continue + ;; + + -L*) + dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 + exit 1 + fi + dir="$absdir" + ;; + esac + case "$deplibs " in + *" -L$dir "*) ;; + *) + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + case :$dllsearchpath: in + *":$dir:"*) ;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac + ;; + esac + continue + ;; + + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in + *-*-cygwin* | *-*-pw32* | *-*-beos*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-mingw* | *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + deplibs="$deplibs $arg" + continue + ;; + + -module) + module=yes + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + # The PATH hackery in wrapper scripts is required on Windows + # in order for the loader to find any dlls it needs. + $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 + $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -o) prev=output ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 + exit 1 + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + continue + ;; + + -static) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -Wc,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + case $flag in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + flag="\"$flag\"" + ;; + esac + arg="$arg $wl$flag" + compiler_flags="$compiler_flags $flag" + done + IFS="$save_ifs" + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + case $flag in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + flag="\"$flag\"" + ;; + esac + arg="$arg $wl$flag" + compiler_flags="$compiler_flags $wl$flag" + linker_flags="$linker_flags $flag" + done + IFS="$save_ifs" + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + ;; + + *.lo | *.$objext) + # A library or standard object. + if test "$prev" = dlfiles; then + # This file was specified with -dlopen. + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $arg" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` + prev= + else + case $arg in + *.lo) libobjs="$libobjs $arg" ;; + *) objs="$objs $arg" ;; + esac + fi + ;; + + *.$libext) + # An archive. + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + dlfiles="$dlfiles $arg" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + dlprefiles="$dlprefiles $arg" + prev= + else + deplibs="$deplibs $arg" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + fi + done # argument parsing loop + + if test -n "$prev"; then + $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + fi + + # calculate the name of the file, without its directory + outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` + if test "X$output_objdir" = "X$output"; then + output_objdir="$objdir" + else + output_objdir="$output_objdir/$objdir" + fi + # Create the object directory. + if test ! -d "$output_objdir"; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir + status=$? + if test "$status" -ne 0 && test ! -d "$output_objdir"; then + exit $status + fi + fi + + # Determine the type of output + case $output in + "") + $echo "$modename: you must specify an output file" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + libs="$libs $deplib" + done + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + case $linkmode in + lib) + passes="conv link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 + exit 1 + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + for pass in $passes; do + if test "$linkmode" = prog; then + # Determine which files to process + case $pass in + dlopen) + libs="$dlfiles" + save_deplibs="$deplibs" # Collect dlpreopened libraries + deplibs= + ;; + dlpreopen) libs="$dlprefiles" ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + esac + fi + for deplib in $libs; do + lib= + found=no + case $deplib in + -l*) + if test "$linkmode" = oldlib && test "$linkmode" = obj; then + $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 + continue + fi + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` + for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + # Search the libtool library + lib="$searchdir/lib${name}.la" + if test -f "$lib"; then + found=yes + break + fi + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + ;; # -l + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + ;; + *) + $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) lib="$deplib" ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + if test "$deplibs_check_method" != pass_all; then + echo + echo "*** Warning: This library needs some functionality provided by $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + else + echo + echo "*** Warning: Linking the shared library $output against the" + echo "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + newdlprefiles="$newdlprefiles $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + if test "$found" = yes || test -f "$lib"; then : + else + $echo "$modename: cannot find the library \`$lib'" 1>&2 + exit 1 + fi + + # Check to see that this really is a libtool archive. + if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + exit 1 + fi + + ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` + test "X$ladir" = "X$lib" && ladir="." + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + # If the library was installed with an old release of libtool, + # it will not redefine variable installed. + installed=yes + + # Read the .la file + case $lib in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then + # Add dl[pre]opened files of deplib + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 + exit 1 + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + tmp_libs="$tmp_libs $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + $echo "$modename: \`$lib' is not a convenience library" 1>&2 + exit 1 + fi + continue + fi # $pass = conv + + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 + exit 1 + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 + exit 1 + fi + if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. + dlprefiles="$dlprefiles $lib" + else + newdlfiles="$newdlfiles $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 + $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 + abs_ladir="$ladir" + fi + ;; + esac + laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + $echo "$modename: warning: library \`$lib' was moved." 1>&2 + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$libdir" + absdir="$libdir" + fi + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi # $installed = yes + name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir"; then + $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 + exit 1 + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" + fi + continue + fi + + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + tmp_libs="$tmp_libs $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + link_static=no # Whether the deplib will be linked statically + if test -n "$library_names" && + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + # Link against this shared library + + if test "$linkmode,$pass" = "prog,link" || + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + if test "$linkmode" = prog; then + # We need to hardcode the library path + if test -n "$shlibpath_var"; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *" $absdir "*) ;; + *) temp_rpath="$temp_rpath $dir" ;; + esac + fi + fi + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + realname="$2" + shift; shift + libname=`eval \\$echo \"$libname_spec\"` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin*) + major=`expr $current - $age` + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + soname=`echo $soroot | sed -e 's/^.*\///'` + newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + $show "extracting exported symbol list from \`$soname'" + save_ifs="$IFS"; IFS='~' + eval cmds=\"$extract_expsyms_cmds\" + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + $show "generating import library for \`$soname'" + save_ifs="$IFS"; IFS='~' + eval cmds=\"$old_archive_from_expsyms_cmds\" + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + $echo "$modename: configuration error: unsupported hardcode properties" + exit 1 + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && \ + test "$hardcode_minus_L" != yes && \ + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + add="-l$name" + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + + # Try to link the static library + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + echo "*** Warning: This library needs some functionality provided by $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + echo "*** Therefore, libtool will create a static module, that should work " + echo "*** as long as the dlopening application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + convenience="$convenience $dir/$old_library" + old_convenience="$old_convenience $dir/$old_library" + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; + esac;; + *) temp_deplibs="$temp_deplibs $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + tmp_libs="$tmp_libs $deplib" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + case $deplib in + -L*) path="$deplib" ;; + *.la) + dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$deplib" && dir="." + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 + absdir="$dir" + fi + ;; + esac + if grep "^installed=no" $deplib > /dev/null; then + path="-L$absdir/$objdir" + else + eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 + exit 1 + fi + if test "$absdir" != "$libdir"; then + $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + fi + path="-L$absdir" + fi + ;; + *) continue ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$deplibs $path" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + test "$pass" != scan && dependency_libs="$newdependency_libs" + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) lib_search_path="$lib_search_path $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + *) + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + if test "$pass" = "conv" && + { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then + libs="$deplibs" # reset libs + deplibs= + fi + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 + fi + + if test -n "$rpath"; then + $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 + fi + + if test -n "$xrpath"; then + $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 + fi + + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 + fi + + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 + fi + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + objs="$objs$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + eval libname=\"$libname_spec\" + ;; + *) + if test "$module" = no; then + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + eval libname=\"$libname_spec\" + else + libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 + exit 1 + else + echo + echo "*** Warning: Linking the shared library $output against the non-libtool" + echo "*** objects $objs is not portable!" + libobjs="$libobjs $objs" + fi + fi + + if test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 + fi + + set dummy $rpath + if test "$#" -gt 2; then + $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 + fi + install_libdir="$2" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + libext=al + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 + fi + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + IFS="$save_ifs" + + if test -n "$8"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + current="$2" + revision="$3" + age="$4" + + # Check that each of the things are valid numbers. + case $current in + [0-9]*) ;; + *) + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + case $revision in + [0-9]*) ;; + *) + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + case $age in + [0-9]*) ;; + *) + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + if test "$age" -gt "$current"; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + major=.`expr $current - $age` + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + minor_current=`expr $current + 1` + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current"; + ;; + + irix) + major=`expr $current - $age + 1` + verstring="sgi$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + iface=`expr $revision - $loop` + loop=`expr $loop - 1` + verstring="sgi$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) + major=.`expr $current - $age` + versuffix="$major.$age.$revision" + ;; + + osf) + major=`expr $current - $age` + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + iface=`expr $current - $loop` + loop=`expr $loop - 1` + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + major=`expr $current - $age` + versuffix="-$major" + ;; + + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + verstring="0.0" + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring="" + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + fi + + if test "$mode" != relink; then + # Remove our outputs. + $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" + $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + oldlibs="$oldlibs $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + for path in $notinst_path; do + lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` + deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` + dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` + done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + temp_xrpath="$temp_xrpath -R$libdir" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) dlfiles="$dlfiles $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) dlprefiles="$dlprefiles $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs -framework System" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + deplibs="$deplibs -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behaviour. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $rm conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null \ + | grep " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | sed 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + esac + done + # It is ok to link against an archive when + # building a shared library. + if $AR -t $potlib > /dev/null 2>&1; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ + | sed 10q \ + | egrep "$file_magic_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + echo "*** Warning: This library needs some functionality provided by $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + fi + else + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + fi + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + for a_deplib in $deplibs; do + name="`expr $a_deplib : '-l\(.*\)'`" + # If $name is empty we are operating on a -L argument. + if test -n "$name" && test "$name" != "0"; then + libname=`eval \\$echo \"$libname_spec\"` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + if eval echo \"$potent_lib\" 2>/dev/null \ + | sed 10q \ + | egrep "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + echo "*** Warning: This library needs some functionality provided by $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + fi + else + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + fi + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ + -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | + grep . >/dev/null; then + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + echo "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + dep_rpath="$dep_rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" + shift; shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + test -z "$dlname" && dlname=$soname + + lib="$output_objdir/$realname" + for link + do + linknames="$linknames $link" + done + + # Ensure that we have .o objects for linkers which dislike .lo + # (e.g. aix) in case we are running --disable-static + for obj in $libobjs; do + xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$obj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` + if test ! -f $xdir/$oldobj; then + $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" + $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? + fi + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + $show "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $run $rm $export_symbols + eval cmds=\"$export_symbols_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + if test -n "$export_symbols_regex"; then + $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" + $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + $show "$mv \"${export_symbols}T\" \"$export_symbols\"" + $run eval '$mv "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' + fi + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval cmds=\"$archive_expsym_cmds\" + else + eval cmds=\"$archive_cmds\" + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? + exit 0 + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; + + obj) + if test -n "$deplibs"; then + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 + fi + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 + fi + + if test -n "$rpath"; then + $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 + fi + + if test -n "$xrpath"; then + $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 + fi + + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 + fi + + case $output in + *.lo) + if test -n "$objs$old_deplibs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 + exit 1 + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e "$lo2o"` + ;; + *) + libobj= + obj="$output" + ;; + esac + + # Delete the old objects. + $run $rm $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" + eval cmds=\"$reload_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + + exit 0 + fi + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + $show "echo timestamp > $libobj" + $run eval "echo timestamp > $libobj" || exit $? + exit 0 + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + eval cmds=\"$reload_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + else + # Just create a symlink. + $show $rm $libobj + $run $rm $libobj + xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$libobj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` + oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` + $show "(cd $xdir && $LN_S $oldobj $baseobj)" + $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? + fi + + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + + exit 0 + ;; + + prog) + case $host in + *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; + esac + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 + fi + + if test "$preload" = yes; then + if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && + test "$dlopen_self_static" = unknown; then + $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." + fi + fi + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + case :$dllsearchpath: in + *":$libdir:"*) ;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + fi + + dlsyms= + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + dlsyms="${outputname}S.c" + else + $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 + fi + fi + + if test -n "$dlsyms"; then + case $dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${outputname}.nm" + + $show "$rm $nlist ${nlist}S ${nlist}T" + $run $rm "$nlist" "${nlist}S" "${nlist}T" + + # Parse the name list into a source file. + $show "creating $output_objdir/$dlsyms" + + test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ +/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ +/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +/* Prevent the only kind of declaration conflicts we can make. */ +#define lt_preloaded_symbols some_other_symbol + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + $show "generating symbol list for \`$output'" + + test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + for arg in $progfiles; do + $show "extracting global C symbols from \`$arg'" + $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + $run eval '$mv "$nlist"T "$nlist"' + fi + + if test -n "$export_symbols_regex"; then + $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' + $run eval '$mv "$nlist"T "$nlist"' + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$output.exp" + $run $rm $export_symbols + $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + else + $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval 'mv "$nlist"T "$nlist"' + fi + fi + + for arg in $dlprefiles; do + $show "extracting global C symbols from \`$arg'" + name=`echo "$arg" | sed -e 's%^.*/%%'` + $run eval 'echo ": $name " >> "$nlist"' + $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + done + + if test -z "$run"; then + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $mv "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then + : + else + grep -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$dlsyms" + fi + + $echo >> "$output_objdir/$dlsyms" "\ + +#undef lt_preloaded_symbols + +#if defined (__STDC__) && __STDC__ +# define lt_ptr void * +#else +# define lt_ptr char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr address; +} +lt_preloaded_symbols[] = +{\ +" + + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" + + $echo >> "$output_objdir/$dlsyms" "\ + {0, (lt_ptr) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + fi + + pic_flag_for_symtable= + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + esac;; + *-*-hpux*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC";; + esac + esac + + # Now compile the dynamic symbol file. + $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + + # Clean up the generated files. + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + + # Transform the symbol file into the correct name. + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 + exit 1 + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi + + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + # Replace the output file specification. + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" + status=$? + + # Delete the generated files. + if test -n "$dlsyms"; then + $show "$rm $output_objdir/${outputname}S.${objext}" + $run $rm "$output_objdir/${outputname}S.${objext}" + fi + + exit $status + fi + + if test -n "$shlibpath_var"; then + # We should set the shlibpath_var + rpath= + for dir in $temp_rpath; do + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) + # Absolute path. + rpath="$rpath$dir:" + ;; + *) + # Relative path: add a thisdir entry. + rpath="$rpath\$thisdir/$dir:" + ;; + esac + done + temp_rpath="$rpath" + fi + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + rpath="$rpath$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $run $rm $output + # Link the executable and exit + $show "$link_command" + $run eval "$link_command" || exit $? + exit 0 + fi + + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 + $echo "$modename: \`$output' will be relinked during installation" 1>&2 + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi + else + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + fi + fi + + # Replace the output file specification. + link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname + + $show "$link_command" + $run eval "$link_command" || exit $? + + # Now create the wrapper script. + $show "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` + relink_command="$var=\"$var_value\"; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + + # Quote $echo for shipping. + if test "X$echo" = "X$SHELL $0 --fallback-echo"; then + case $0 in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; + *) qecho="$SHELL `pwd`/$0 --fallback-echo";; + esac + qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` + fi + + # Only actually do things if our run command is non-null. + if test -z "$run"; then + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) output=`echo $output|sed 's,.exe$,,'` ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) exeext=.exe ;; + *) exeext= ;; + esac + $rm $output + trap "$rm $output; exit 1" 1 2 15 + + $echo > $output "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +sed_quote_subst='$sed_quote_subst' + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variable: + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$echo are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + echo=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$echo works! + : + else + # Restart under the correct shell, and then maybe \$echo will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $echo >> $output "\ + + # Find the directory that this script lives in. + thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` + done + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; then + echo >> $output "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $mkdir \"\$progdir\" + else + $rm \"\$progdir/\$file\" + fi" + + echo >> $output "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $echo \"\$relink_command_output\" >&2 + $rm \"\$progdir/\$file\" + exit 1 + fi + fi + + $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $rm \"\$progdir/\$program\"; + $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $rm \"\$progdir/\$file\" + fi" + else + echo >> $output "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + echo >> $output "\ + + if test -f \"\$progdir/\$program\"; then" + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $echo >> $output "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + + export $shlibpath_var +" + fi + + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $echo >> $output "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + $echo >> $output "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +" + case $host in + # win32 systems need to use the prog path for dll + # lookup to work + *-*-cygwin* | *-*-pw32*) + $echo >> $output "\ + exec \$progdir/\$program \${1+\"\$@\"} +" + ;; + + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2*) + $echo >> $output "\ + exec \$progdir\\\\\$program \${1+\"\$@\"} +" + ;; + + *) + $echo >> $output "\ + # Export the path to the program. + PATH=\"\$progdir:\$PATH\" + export PATH + + exec \$program \${1+\"\$@\"} +" + ;; + esac + $echo >> $output "\ + \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + exit 1 + fi + else + # The program doesn't exist. + \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 + \$echo \"This script is just a wrapper for \$program.\" 1>&2 + echo \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" + chmod +x $output + fi + exit 0 + ;; + esac + + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` + fi + addlibs="$old_convenience" + fi + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + eval cmds=\"$old_archive_from_new_cmds\" + else + # Ensure that we have .o objects in place in case we decided + # not to build a shared library, and have fallen back to building + # static libs even though --disable-static was passed! + for oldobj in $oldobjs; do + if test ! -f $oldobj; then + xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$oldobj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` + obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` + $show "(cd $xdir && ${LN_S} $obj $baseobj)" + $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? + fi + done + + eval cmds=\"$old_archive_cmds\" + fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + done + + if test -n "$generated"; then + $show "${rm}r$generated" + $run ${rm}r$generated + fi + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + $show "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` + relink_command="$var=\"$var_value\"; export $var; $relink_command" + fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + + # Only create the output if not a dry run. + if test -z "$run"; then + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` + eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 + exit 1 + fi + newdependency_libs="$newdependency_libs $libdir/$name" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + for lib in $dlfiles; do + name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + exit 1 + fi + newdlfiles="$newdlfiles $libdir/$name" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + if test -z "$libdir"; then + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + exit 1 + fi + newdlprefiles="$newdlprefiles $libdir/$name" + done + dlprefiles="$newdlprefiles" + fi + $rm $output + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac + $echo > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $echo >> $output "\ +relink_command=\"$relink_command\"" + fi + done + fi + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" + $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; + esac + exit 0 + ;; + + # libtool install mode + install) + modename="$modename: install" + + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then + # Aesthetically quote it. + arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$arg " + arg="$1" + shift + else + install_prog= + arg="$nonopt" + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$install_prog$arg" + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + for arg + do + if test -n "$dest"; then + files="$files $dest" + dest="$arg" + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) prev="-f" ;; + -g) prev="-g" ;; + -m) prev="-m" ;; + -o) prev="-o" ;; + -s) + stripme=" -s" + continue + ;; + -*) ;; + + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else + dest="$arg" + continue + fi + ;; + esac + + # Aesthetically quote the argument. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + arg="\"$arg\"" + ;; + esac + install_prog="$install_prog $arg" + done + + if test -z "$install_prog"; then + $echo "$modename: you must specify an install program" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test -n "$prev"; then + $echo "$modename: the \`$prev' option requires an argument" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + if test -z "$files"; then + if test -z "$dest"; then + $echo "$modename: no file or destination specified" 1>&2 + else + $echo "$modename: you must specify a destination" 1>&2 + fi + $echo "$help" 1>&2 + exit 1 + fi + + # Strip any trailing slash from the destination. + dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= + else + destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` + test "X$destdir" = "X$dest" && destdir=. + destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + + # Not a directory, so check to see that there is only one file specified. + set dummy $files + if test "$#" -gt 2; then + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; + + *.la) + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + library_names= + old_library= + relink_command= + # If there is no directory component, then add one. + case $file in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi + + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ + test "X$dir" = "X$file/" && dir= + dir="$dir$objdir" + + if test -n "$relink_command"; then + $echo "$modename: warning: relinking \`$file'" 1>&2 + $show "$relink_command" + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 + continue + fi + fi + + # See the names of the shared library. + set dummy $library_names + if test -n "$2"; then + realname="$2" + shift + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + $show "$install_prog $dir/$srcname $destdir/$realname" + $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? + if test -n "$stripme" && test -n "$striplib"; then + $show "$striplib $destdir/$realname" + $run eval "$striplib $destdir/$realname" || exit $? + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + for linkname + do + if test "$linkname" != "$realname"; then + $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + fi + done + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" + eval cmds=\"$postinstall_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + + # Install the pseudo-library for information purposes. + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac + + # Install the libtool object if requested. + if test -n "$destfile"; then + $show "$install_prog $file $destfile" + $run eval "$install_prog $file $destfile" || exit $? + fi + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` + + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi + exit 0 + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + destfile="$destdir/$destfile" + fi + + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + notinst_deplibs= + relink_command= + + # If there is no directory component, then add one. + case $file in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Check the variables that should have been set. + if test -z "$notinst_deplibs"; then + $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 + exit 1 + fi + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + # If there is no directory component, then add one. + case $lib in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + fi + libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 + finalize=no + fi + done + + relink_command= + # If there is no directory component, then add one. + case $file in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + if test "$finalize" = yes && test -z "$run"; then + tmpdir="/tmp" + test -n "$TMPDIR" && tmpdir="$TMPDIR" + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` + if test $? = 0 ; then : + else + tmpdir="$tmpdir/libtool-$$" + fi + if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : + else + $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 + continue + fi + file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + + $show "$relink_command" + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 + ${rm}r "$tmpdir" + continue + fi + file="$outputname" + else + $echo "$modename: warning: cannot relink \`$file'" 1>&2 + fi + else + # Install the binary that we compiled earlier. + file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyways + case $install_prog,$host in + /usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + destfile=`echo $destfile | sed -e 's,.exe$,,'` + ;; + esac + ;; + esac + $show "$install_prog$stripme $file $destfile" + $run eval "$install_prog\$stripme \$file \$destfile" || exit $? + test -n "$outputname" && ${rm}r "$tmpdir" + ;; + esac + done + + for file in $staticlibs; do + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + + $show "$install_prog $file $oldlib" + $run eval "$install_prog \$file \$oldlib" || exit $? + + if test -n "$stripme" && test -n "$striplib"; then + $show "$old_striplib $oldlib" + $run eval "$old_striplib $oldlib" || exit $? + fi + + # Do each command in the postinstall commands. + eval cmds=\"$old_postinstall_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + done + + if test -n "$future_libdirs"; then + $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 + fi + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + test -n "$run" && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $0 --finish$current_libdirs' + else + exit 0 + fi + ;; + + # libtool finish mode + finish) + modename="$modename: finish" + libdirs="$nonopt" + admincmds= + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + eval cmds=\"$finish_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || admincmds="$admincmds + $cmd" + done + IFS="$save_ifs" + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $run eval "$cmds" || admincmds="$admincmds + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 + + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + echo " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + echo " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + echo " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + echo "See any operating system documentation about shared libraries for" + echo "more information, such as the ld(1) and ld.so(8) manual pages." + echo "----------------------------------------------------------------------" + exit 0 + ;; + + # libtool execute mode + execute) + modename="$modename: execute" + + # The first argument is the command name. + cmd="$nonopt" + if test -z "$cmd"; then + $echo "$modename: you must specify a COMMAND" 1>&2 + $echo "$help" + exit 1 + fi + + # Handle -dlopen flags immediately. + for file in $execute_dlfiles; do + if test ! -f "$file"; then + $echo "$modename: \`$file' is not a file" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + dir= + case $file in + *.la) + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + # Read the libtool library. + dlname= + library_names= + + # If there is no directory component, then add one. + case $file in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" + continue + fi + + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$file" && dir=. + + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit 1 + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + test "X$dir" = "X$file" && dir=. + ;; + + *) + $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -*) ;; + *) + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + # If there is no directory component, then add one. + case $file in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` + args="$args \"$file\"" + done + + if test -z "$run"; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved enviroment variables + if test "${save_LC_ALL+set}" = set; then + LC_ALL="$save_LC_ALL"; export LC_ALL + fi + if test "${save_LANG+set}" = set; then + LANG="$save_LANG"; export LANG + fi + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" + $echo "export $shlibpath_var" + fi + $echo "$cmd$args" + exit 0 + fi + ;; + + # libtool clean and uninstall mode + clean | uninstall) + modename="$modename: $mode" + rm="$nonopt" + files= + rmforce= + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + for arg + do + case $arg in + -f) rm="$rm $arg"; rmforce=yes ;; + -*) rm="$rm $arg" ;; + *) files="$files $arg" ;; + esac + done + + if test -z "$rm"; then + $echo "$modename: you must specify an RM program" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + rmdirs= + + for file in $files; do + dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` + if test "X$dir" = "X$file"; then + dir=. + objdir="$objdir" + else + objdir="$dir/$objdir" + fi + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + test "$mode" = uninstall && objdir="$dir" + + # Remember objdir for removal later, being careful to avoid duplicates + if test "$mode" = clean; then + case " $rmdirs " in + *" $objdir "*) ;; + *) rmdirs="$rmdirs $objdir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if (test -L "$file") >/dev/null 2>&1 \ + || (test -h "$file") >/dev/null 2>&1 \ + || test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif test "$rmforce" = yes; then + continue + fi + + rmfiles="$file" + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + . $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + rmfiles="$rmfiles $objdir/$n" + done + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + + if test "$mode" = uninstall; then + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + eval cmds=\"$postuninstall_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then + exit_status=1 + fi + done + IFS="$save_ifs" + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + eval cmds=\"$old_postuninstall_cmds\" + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" + if test "$?" -ne 0 && test "$rmforce" != yes; then + exit_status=1 + fi + done + IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. + fi + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file + . $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" \ + && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" \ + && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi + fi + ;; + + *) + # Do a test to see if this is a libtool program. + if test "$mode" = clean && + (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + relink_command= + . $dir/$file + + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + rmfiles="$rmfiles $objdir/lt-$name" + fi + fi + ;; + esac + $show "$rm $rmfiles" + $run $rm $rmfiles || exit_status=1 + done + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + $show "rmdir $dir" + $run rmdir $dir >/dev/null 2>&1 + fi + done + + exit $exit_status + ;; + + "") + $echo "$modename: you must specify a MODE" 1>&2 + $echo "$generic_help" 1>&2 + exit 1 + ;; + esac + + if test -z "$exec_cmd"; then + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 + exit 1 + fi +fi # test -z "$show_help" + +if test -n "$exec_cmd"; then + eval exec $exec_cmd + exit 1 +fi + +# We need to display help for each of the modes. +case $mode in +"") $echo \ +"Usage: $modename [OPTION]... [MODE-ARG]... + +Provide generalized library-building support services. + + --config show all configuration variables + --debug enable verbose shell tracing +-n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --finish same as \`--mode=finish' + --help display this help message and exit + --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] + --quiet same as \`--silent' + --silent don't print informational messages + --version print version information + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for +a more detailed description of MODE." + exit 0 + ;; + +clean) + $echo \ +"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +Remove files from the build directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + +compile) + $echo \ +"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only + -static always build a \`.o' file suitable for static linking + +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; + +execute) + $echo \ +"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to \`-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + +finish) + $echo \ +"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; + +install) + $echo \ +"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + +link) + $echo \ +"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -static do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + +All other options (arguments beginning with \`-') are ignored. + +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. + +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; + +uninstall) + $echo \ +"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + +*) + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; +esac + +echo +$echo "Try \`$modename --help' for more information about other modes." + +exit 0 + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: -- 2.7.4