From: Scott James Remnant Date: Fri, 11 Mar 2005 09:00:14 +0000 (+0000) Subject: dpkg (1.13.1.0.1) experimental; urgency=low X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=841a630143cd3a35dbf8bce0a111ebd39dd12f44;p=dpkg dpkg (1.13.1.0.1) experimental; urgency=low * Bin-MU; recompile against Debian unstable, to make dselect actually installable. -- Scott James Remnant Fri, 11 Mar 2005 09:00:14 +0000 --- diff --git a/ABOUT-NLS b/ABOUT-NLS index b3049ecd..2f50c669 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -1,11 +1,10 @@ -1 Notes on the Free Translation Project -*************************************** +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 free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. +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, @@ -16,15 +15,15 @@ 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 on translations can contact the appropriate team. +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. -1.1 Quick configuration advice -============================== +Quick configuration advice +========================== If you want to exploit the full power of internationalization, you should configure it using @@ -46,8 +45,8 @@ to change to GNU `gettext' as soon as possible. you have installed a recent copy of the GNU gettext package with the included `libintl'. -1.2 INSTALL Matters -=================== +INSTALL Matters +=============== Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such @@ -56,27 +55,27 @@ 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 included GNU -`gettext' 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: +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 +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 not be 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 +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 @@ -87,7 +86,7 @@ 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 usually have many `po/LL.po' files, where + 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 @@ -96,8 +95,8 @@ 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. -1.3 Using This Package -====================== +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 @@ -145,8 +144,8 @@ 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. -1.4 Translating Teams -===================== +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 @@ -175,789 +174,562 @@ coordinator for all translator teams. the terminology in use. Proven linguistic skill are praised more than programming skill, here. -1.5 Available Packages -====================== +Available Packages +================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of February -2005. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of January +2004. 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 af am ar az be bg bs ca cs cy da de el en en_GB + Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | | + ap-utils | | + aspell | [] | + bash | [] [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | [] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + fslint | | + gas | [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] | + gnubiff | [] | + gnucash | [] () [] [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] | + gpsdrive | () () () | + gramadoir | [] | + grep | [] [] [] [] [] [] | + gretl | [] | + gtick | [] () | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] | + iso_639 | | + jpilot | [] [] [] | + jtag | | + jwhois | [] | + kbd | [] [] [] [] [] | + latrine | () | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | | + sharutils | [] [] [] [] [] [] | + silky | () | + skencil | [] () [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] [] | + tin | () () | + tp-robot | | + tuxpaint | [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] | + xchat | [] [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs da de el en en_GB eo es + 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 + + et eu fa fi fr ga gl he hr hu id is it ja ko lg +-------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] | - bash | [] [] | - batchelor | [] | - bfd | [] | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bluez-pin | [] [] [] [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] () [] [] [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | [] () () [] | - gnucash-glossary | [] () | - gnupg | [] () [] [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] | - gtick | [] () | - gtkspell | [] [] [] | - hello | [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] | - iso_3166 | | - iso_3166_1 | [] [] [] [] [] | + a2ps | [] [] [] () () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] | + aspell | [] [] | + bash | [] [] | + batchelor | [] [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] [] | + clisp | | + clisp | [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | [] | + gawk | [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | () [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] [] [] | + gpe-clock | [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () () () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] [] | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] | iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | | + iso_3166_3 | | + iso_4217 | [] [] [] [] [] [] | iso_639 | | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - latrine | () | - ld | [] | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] [] [] | - libgsasl | | - libiconv | [] [] [] [] [] | - libidn | | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] | - mysecretdiary | [] [] | - nano | [] () [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | [] [] [] [] | - psmisc | | - ptx | [] [] [] | - pwdutils | | + jpilot | [] () | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] | + latrine | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] | + man-db | () () | + minicom | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | python | | - radius | [] | - recode | [] [] [] [] [] | - rpm | [] [] | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] [] | screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] | - sharutils | [] [] [] [] [] | - silky | () | - skencil | [] () | - sketch | [] () | - solfege | [] [] | - soundtracker | [] [] | - sp | [] | - stardict | [] | - tar | | - texinfo | [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] | + scrollkeeper | [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] | + sharutils | [] [] [] [] [] | + silky | () [] () () | + skencil | [] | + sketch | [] | + soundtracker | [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] | + tin | [] () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] [] | unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] | - xchat | [] [] [] [] | - xfree86_xkb_xml | [] [] [] [] | - xkeyboard-config | | - xpad | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | +-------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB - 11 0 0 3 7 4 0 42 44 3 55 92 21 1 15 - - eo es et eu fa fi fr ga gl he hr hu id is it - +-----------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] | - aspell | [] [] | - bash | [] [] [] [] | - batchelor | [] [] | - bfd | [] [] | - bibshelf | [] [] [] | - binutils | [] [] | - bison | [] [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] | - cpio | [] [] | - cpplib | [] [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | [] [] () | - gnucash | [] () [] | - gnucash-glossary | [] [] | - gnupg | [] [] [] [] [] [] [] [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] | - gpe-conf | [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-go | [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] | - gpe-todo | [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] | - gst-plugins | [] [] [] | - gstreamer | [] | - gtick | [] [] [] [] [] | - gtkspell | [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] | - iso_3166_1 | [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] | - iso_639 | [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - latrine | [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] [] [] [] [] | - libgsasl | [] [] | - libiconv | [] [] [] [] [] [] [] [] [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] () [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - psmisc | [] | - ptx | [] [] [] [] [] [] [] [] [] | - pwdutils | | - python | | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] | - screem | | - scrollkeeper | [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] | - silky | () [] () () | - skencil | [] [] | - sketch | [] [] | - solfege | [] [] [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] | - tuxpaint | [] [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] | - xfree86_xkb_xml | [] [] | - xkeyboard-config | | - xpad | [] [] [] | - +-----------------------------------------------+ - eo es et eu fa fi fr ga gl he hr hu id is it - 14 87 22 15 2 25 119 44 18 8 6 41 28 1 41 - - ja ko lg lt lv mk mn ms mt nb nl nn no nso or - +-----------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | | - aspell | [] [] | - bash | [] | - batchelor | [] | - bfd | | - bibshelf | | - binutils | [] | - bison | [] [] [] | - bluez-pin | [] | - clisp | [] | - console-tools | | - coreutils | [] [] | - cpio | | - cpplib | | - darkstat | [] [] | - dialog | [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | | - flex | [] [] | - fslint | [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] | - gnubiff | | - gnucash | () () [] | - gnucash-glossary | [] | - gnupg | [] [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] | - gpe-conf | [] | - gpe-contacts | | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] | - gpe-ownerinfo | [] | - gpe-sketchbook | [] | - gpe-su | [] | - gpe-taskmanager | [] | - gpe-timesheet | [] | - gpe-today | [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] [] | - gstreamer | [] | - gtick | [] | - gtkspell | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_1 | [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - latrine | [] | - ld | | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] | - libgsasl | [] | - libiconv | [] | - libidn | | - lifelines | [] | - lilypond | [] | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - psmisc | [] | - ptx | [] [] [] | - pwdutils | | - python | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] | - sharutils | [] [] | - silky | [] | - skencil | | - sketch | | - solfege | [] [] | - soundtracker | | - sp | () | - stardict | [] [] | - tar | [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xfree86_xkb_xml | [] | - xkeyboard-config | [] | - xpad | [] | - +-----------------------------------------------+ - ja ko lg lt lv mk mn ms mt nb nl nn no nso or - 35 11 1 1 2 2 3 11 0 14 96 7 5 0 1 - - pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +----------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | [] [] | - bibshelf | | - binutils | [] [] | - bison | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] | - cpplib | | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] | - fetchmail | [] () [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | | - gettext-examples | [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () [] | - gnucash | () [] [] [] [] | - gnucash-glossary | [] [] [] | - gnupg | [] [] [] | - gpe-aerial | [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] | - gpe-contacts | [] [] [] | - gpe-edit | [] [] [] [] [] [] [] | - gpe-go | [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] [] [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] | - gramadoir | [] | - grep | [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] [] [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] [] [] | - gtkspell | [] [] [] [] [] | - hello | [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] | - iso_3166_1 | [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] [] [] | - iso_4217 | [] [] | - iso_639 | [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] () () | - kbd | [] [] [] | - latrine | [] [] | - ld | [] | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] [] [] [] [] [] | - libgsasl | [] [] [] | - libiconv | [] [] [] [] [] [] [] [] [] [] | - libidn | [] () | - lifelines | [] [] | - lilypond | [] | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - psmisc | [] [] | - ptx | [] [] [] [] [] [] | - pwdutils | [] | - python | | - radius | [] [] | - recode | [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] | - silky | () [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] | - xfree86_xkb_xml | [] [] [] [] [] | - xkeyboard-config | | - xpad | | - +----------------------------------------------+ - pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 48 27 58 6 79 71 4 47 13 13 51 90 0 - - tg th tk tr uk ven vi wa xh zh_CN zh_TW zu - +--------------------------------------------+ - GNUnet | | 0 - a2ps | [] [] | 18 - aegis | | 0 - ant-phone | [] | 4 - anubis | [] | 9 - ap-utils | () | 1 - aspell | [] [] | 12 - bash | | 10 - batchelor | [] [] | 7 - bfd | [] | 6 - bibshelf | [] | 5 - binutils | [] [] | 8 - bison | [] | 17 - bluez-pin | [] [] [] [] [] | 24 - clisp | | 7 - console-tools | | 3 - coreutils | [] | 16 - cpio | [] | 5 - cpplib | [] | 6 - darkstat | [] () () | 15 - dialog | [] [] | 22 - diffutils | [] [] [] | 27 - doodle | | 4 - e2fsprogs | [] | 8 - enscript | [] | 12 - error | [] [] | 15 - fetchmail | [] | 12 - fileutils | [] [] [] | 18 - findutils | [] | 14 - flex | [] | 14 - fslint | [] | 7 - gas | [] | 3 - gawk | [] | 13 - gbiff | | 4 - gcal | [] | 5 - gcc | | 1 - gettext-examples | [] [] [] [] | 19 - gettext-runtime | [] [] [] [] [] | 24 - gettext-tools | [] [] [] | 16 - gimp-print | [] | 11 - gip | [] | 8 - gliv | | 5 - glunarclock | [] [] | 14 - gmult | [] [] [] | 13 - gnubiff | | 3 - gnucash | () [] | 10 - gnucash-glossary | [] | 8 - gnupg | [] [] [] | 19 - gpe-aerial | [] | 12 - gpe-beam | [] [] | 13 - gpe-calendar | [] [] [] [] | 18 - gpe-clock | [] [] [] | 15 - gpe-conf | [] [] | 12 - gpe-contacts | [] [] | 6 - gpe-edit | [] [] [] | 14 - gpe-go | [] | 10 - gpe-login | [] [] [] [] | 17 - gpe-ownerinfo | [] [] [] | 17 - gpe-sketchbook | [] | 13 - gpe-su | [] [] | 14 - gpe-taskmanager | [] [] | 14 - gpe-timesheet | [] [] [] | 16 - gpe-today | [] [] [] [] | 17 - gpe-todo | [] [] [] | 16 - gphoto2 | [] [] | 17 - gprof | [] [] | 10 - gpsdrive | | 2 - gramadoir | [] | 6 - grep | [] [] [] [] | 32 - gretl | | 4 - gsasl | [] [] | 12 - gss | [] | 5 - gst-plugins | [] [] | 16 - gstreamer | [] [] [] | 14 - gtick | [] | 11 - gtkspell | [] [] [] | 18 - hello | [] [] [] [] | 37 - id-utils | [] [] | 13 - impost | [] | 3 - indent | [] [] [] | 24 - iso_3166 | [] | 9 - iso_3166_1 | [] [] | 19 - iso_3166_2 | | 2 - iso_3166_3 | [] [] | 8 - iso_4217 | [] | 8 - iso_639 | [] | 10 - jpilot | [] [] [] | 6 - jtag | | 2 - jwhois | [] [] [] | 12 - kbd | [] | 11 - latrine | [] [] | 8 - ld | [] | 5 - libc | [] [] | 22 - libextractor | | 0 - libgpewidget | [] [] | 17 - libgsasl | [] | 7 - libiconv | [] [] [] [] [] | 32 - libidn | [] | 4 - lifelines | | 4 - lilypond | [] | 5 - lingoteach | | 5 - lynx | [] [] | 14 - m4 | [] [] | 17 - mailutils | [] | 7 - make | [] [] | 18 - man-db | | 5 - minicom | | 11 - mysecretdiary | [] [] | 11 - nano | | 11 - nano_1_0 | [] [] | 17 - opcodes | [] | 7 - parted | [] [] [] | 17 - psmisc | [] | 5 - ptx | [] [] | 23 - pwdutils | | 1 - python | | 0 - radius | [] | 6 - recode | [] [] | 22 - rpm | [] [] | 11 - screem | | 1 - scrollkeeper | [] [] | 22 - sed | [] | 17 - sh-utils | [] | 15 - shared-mime-info | [] [] | 19 - sharutils | [] [] [] | 20 - silky | | 3 - skencil | | 6 - sketch | | 6 - solfege | | 8 - soundtracker | [] | 8 - sp | [] | 3 - stardict | [] [] [] [] | 10 - tar | [] [] | 13 - texinfo | [] [] | 14 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] | 7 - tuxpaint | [] [] [] [] | 34 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux | [] [] | 16 - vorbis-tools | [] | 10 - wastesedge | | 1 - wdiff | [] | 21 - wget | [] [] [] [] | 30 - xchat | [] [] | 21 - xfree86_xkb_xml | [] [] [] | 15 - xkeyboard-config | | 1 - xpad | [] | 5 - +--------------------------------------------+ - 71 teams tg th tk tr uk ven vi wa xh zh_CN zh_TW zu - 149 domains 0 0 1 66 30 0 54 16 0 42 21 0 1695 + et eu fa fi fr ga gl he hr hu id is it ja ko lg + 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 + + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + +-----------------------------------------------------+ + a2ps | [] [] () () [] [] [] | + aegis | () () () | + ant-phone | [] [] | + anubis | [] [] [] [] [] [] | + ap-utils | [] () [] | + aspell | [] | + bash | [] [] [] | + batchelor | [] | + bfd | [] | + binutils | [] | + bison | [] [] [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] | + console-tools | [] | + coreutils | [] [] | + cpio | [] [] [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] [] [] [] | + e2fsprogs | [] | + enscript | [] [] [] [] | + error | [] [] [] | + fetchmail | [] [] () [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + fslint | [] [] | + gas | | + gawk | [] [] [] | + gbiff | [] [] | + gcal | | + gcc | | + gettext | [] [] [] | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] | + gliv | [] [] [] | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | [] [] () [] | + gnucash-glossary | [] [] | + gnupg | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] | + gprof | [] [] | + gpsdrive | () () [] | + gramadoir | () [] | + grep | [] [] [] [] [] | + gretl | | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] | + iso_3166_1 | [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] | + jpilot | () () | + jtag | | + jwhois | [] [] [] [] () | + kbd | [] [] [] | + latrine | [] | + ld | | + libc | [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] [] | + lifelines | | + lilypond | | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] | + minicom | [] [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] [] | + python | | + radius | [] [] | + recode | [] [] [] [] | + rpm | [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] | + sharutils | [] [] | + silky | () | + skencil | [] [] | + sketch | [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] | + vorbis-tools | [] [] [] | + wastesedge | | + wdiff | [] [] [] [] [] | + wget | [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | + +-----------------------------------------------------+ + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 + + sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + +-----------------------------------------------------+ + a2ps | [] [] [] [] | 16 + aegis | | 0 + ant-phone | | 3 + anubis | [] [] | 9 + ap-utils | () | 3 + aspell | | 4 + bash | | 9 + batchelor | | 3 + bfd | [] [] | 6 + binutils | [] [] [] | 8 + bison | [] [] | 14 + bluez-pin | [] [] [] | 14 + clisp | | 0 + clisp | | 5 + console-tools | | 3 + coreutils | [] [] [] [] | 16 + cpio | [] [] | 14 + darkstat | [] [] [] () () | 12 + diffutils | [] [] [] | 23 + e2fsprogs | [] [] | 6 + enscript | [] [] | 12 + error | [] [] [] | 15 + fetchmail | [] [] | 11 + fileutils | [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] | 29 + flex | [] [] | 13 + fslint | | 3 + gas | [] | 3 + gawk | [] [] | 12 + gbiff | | 4 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] | 16 + gettext-examples | [] [] [] [] [] | 14 + gettext-runtime | [] [] [] [] [] [] [] [] | 22 + gettext-tools | [] [] [] [] [] [] | 14 + gimp-print | [] [] | 10 + gliv | | 3 + glunarclock | [] [] [] | 13 + gnubiff | | 3 + gnucash | [] [] | 9 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 17 + gpe-aerial | [] | 7 + gpe-beam | [] | 8 + gpe-calendar | [] [] [] [] | 13 + gpe-clock | [] [] [] | 10 + gpe-conf | [] [] | 9 + gpe-contacts | [] [] [] | 11 + gpe-edit | [] [] [] [] [] | 12 + gpe-go | | 5 + gpe-login | [] [] [] [] [] | 13 + gpe-ownerinfo | [] [] [] [] | 13 + gpe-sketchbook | [] [] | 9 + gpe-su | [] [] [] | 10 + gpe-taskmanager | [] [] [] | 10 + gpe-timesheet | [] [] [] [] | 12 + gpe-today | [] [] [] [] [] | 13 + gpe-todo | [] [] [] [] | 12 + gphoto2 | [] [] [] | 11 + gprof | [] [] | 9 + gpsdrive | [] [] | 3 + gramadoir | [] | 5 + grep | [] [] [] [] | 26 + gretl | | 3 + gtick | | 7 + hello | [] [] [] [] [] | 34 + id-utils | [] [] | 12 + indent | [] [] [] [] | 21 + iso_3166 | [] [] [] [] [] [] [] | 27 + iso_3166_1 | [] [] [] | 16 + iso_3166_2 | | 0 + iso_3166_3 | | 2 + iso_4217 | [] [] [] [] [] [] | 24 + iso_639 | | 1 + jpilot | [] [] [] [] [] | 9 + jtag | [] | 2 + jwhois | () [] [] | 11 + kbd | [] [] | 11 + latrine | | 2 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | [] [] [] [] | 13 + libiconv | [] [] [] [] [] [] [] [] | 27 + lifelines | [] | 2 + lilypond | [] | 3 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] | 14 + m4 | [] [] | 15 + mailutils | | 5 + make | [] [] [] | 16 + man-db | [] | 5 + minicom | | 11 + mysecretdiary | [] [] | 10 + nano | [] [] [] [] | 17 + nano_1_0 | [] [] [] | 17 + opcodes | [] [] | 6 + parted | [] [] [] | 15 + ptx | [] [] | 22 + python | | 0 + radius | | 4 + recode | [] [] [] | 20 + rpm | [] [] | 9 + screem | [] [] | 2 + scrollkeeper | [] [] [] | 15 + sed | [] [] [] [] [] [] | 24 + sh-utils | [] [] | 14 + shared-mime-info | [] [] | 7 + sharutils | [] [] [] [] | 17 + silky | () | 3 + skencil | [] | 6 + sketch | [] | 6 + soundtracker | [] [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] | 14 + textutils | [] [] [] [] | 16 + tin | | 1 + tp-robot | | 2 + tuxpaint | [] [] [] [] [] | 29 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] | 15 + vorbis-tools | | 8 + wastesedge | | 0 + wdiff | [] [] [] | 18 + wget | [] [] [] [] [] [] [] [] | 24 + xchat | [] [] [] [] [] | 15 + xfree86_xkb_xml | [] [] [] [] [] | 11 + xpad | | 5 + +-----------------------------------------------------+ + 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 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 @@ -970,13 +742,13 @@ 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 February 2005 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 + If January 2004 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'. -1.6 Using `gettext' in new packages -=================================== +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 diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..30b95528 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,32 @@ +The C implementation of dpkg was originally written by: + + Ian Jackson + +based on the Perl implementation by: + + Matt Welsh + Carl Streeter + Ian Murdock + + +It is currently maintained by: + + Scott James Remnant + +and has previously been maintained by: + + Adam Heath (2001-2003) + Wichert Akkerman (1999-2003) + Ben Collins (1999-2001) + Daniel Jacobowitz (1998) + J.H.M. Dassen (Ray) (1998) + James Troup (1998) + Nils Rennebarth (1998) + Klee Dienes (1997) + Guy Maor (1997) + Heiko Schlittermann (1996) + + +Countless other people have contributed to dpkg (see THANKS) and provided +code for which they claim copyright (see debian/copyright). Many thanks +to them all. diff --git a/COPYING b/COPYING index a43ea212..d60c31a9 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 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. @@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs 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 @@ -291,7 +291,7 @@ 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) 19yy + Copyright (C) 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 @@ -305,14 +305,15 @@ the "copyright" line and a pointer to where the full notice is found. 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., 675 Mass Ave, Cambridge, MA 02139, USA. + 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 version 69, Copyright (C) year 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. diff --git a/ChangeLog b/ChangeLog index 7253573b..91b97987 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,271 +1,724 @@ -Thu May 26 18:18:10 BST 2005 Scott James Remnant +2005-03-03 Scott James Remnant + + * configure.ac: Release 1.13.1. + +2005-03-03 Michael Vogt + + * src/configure.c (promptconfaction): Output conffile-prompt + status onto status-fd to let front-ends capture conflicts. + * src/errors.c (print_error_perpackage): Output package errors + onto status-fd to let front-ends capture them. + * man/C/dpkg.1: Document how errors and configuration file + conflicts are reported on the status-fd. + +2005-01-22 Scott James Remnant + + * man/C/dpkg.1: Remove --print-gnu-build-architecture and + --print-installation-architecture from documentation, correct + --print-architecture. + * man/C/dpkg-architecture.1: Give --print-architecture in examples, + instead of --print-installation-architecture. + * scripts/dpkg-name.sh (getname): Call 'dpkg --print-architecture' + instead of 'dpkg --print-installation-architecture'. + * scripts/dpkg-architecture.pl: Set the default $pkgdatadir to + point at an installed copy. + Call 'dpkg --print-architecture' instead of + 'dpkg --print-installation-architecture'. + * methods/disk/setup (iarch): Call dpkg --print-architecture. + * debian/control ([dpkg-dev]Depends, [dselect]Depends): Depend on + dpkg (>= 1.13.1) so we get a dpkg with the right print options. + + * src/enquiry.c (printarch): Completely nuke this function, we'll + no longer parse the compiler output and look up things in archtable. + (printinstarch): Rename to printarch, and change the output message + to refer to --print-architecture. + (badlgccfn): Remove unused function. + * src/main.c (cmdinfos): Remove --print-gnu-build-architecture option, + make --print-installation-architecture call printarch. + (usage): Remove both --print-gnu-build-architecture and + --print-installation-architecture and describe --print-architecture + as doing what --p-i-a used to do. Use dpkg-architecture for host + information. + * src/main.h (action): Remove act_printgnuarch from enum, leave + act_printinstarch so we can later deprecate use of the longer command. + * src/Makefile.am (archtable.h): No need to generate archtable.h + seeing as we don't parse it within dpkg, remove rule to generate it. + (CLEANFILES): We don't generate archtable.h, so no need to clean it. + * src/.arch-inventory: Don't treat archtable.h specially. + * archtable: Remove unused third field, entirely inaccurate too. + Correct typo 'she3eb' -> 'sh3eb'. + * scripts/dpkg-architecture.pl (read_archtable): Parse only two + fields from archtable. + + * scripts/dpkg-architecture.pl: Remove out-of-date history from the + top, ChangeLog serves better now and is less confusing. + Reset $gcc if we get less than, or more than one archtable result. + Remove extra newline from mismatched -a/-t warning. + (usageversion): Pedant the usage message while we scroll past. + (read_archtable): New function to read /usr/share/dpkg/archtable + rather than hard-coding some values in the script. + (rewrite_gnu): Rewrite along the lines of the code in m4/arch.m4 so + they should actually be vaguely consistent now. + + * scripts/Makefile.am (do_perl_subst): Replace occurances of + $pkgdatadir in scripts with the right value. + +2005-01-22 Robert Millan , + + * configure.ac: Check for kvm.h. + * utils/start-stop-daemon.c: Remove includes for , + and for the BSDs unless configure found + . + (fatal): Output the message associated with errno. + +2005-01-22 Rakesh 'arky' Ambati + + * scripts/dpkg-architecture.pl: Correct typo, 'filed' to 'failed'. + +2005-01-22 Robert Millan , + Scott James Remnant + + * m4/arch.m4 (DPKG_CPU_TYPE): Add a new macro to turn common + groups of CPU names into a single type (e.g. i*86 to i386). + (DPKG_OS_TYPE): Match linux*-gnu* for Linux (in case we get a + non-GNU Linux at some point) and produce a 'linux' type. Remove + the initial '*' from the rest of the entries. Restore gnu* as + gnu (for the Hurd). Add support for darwin* as darwin. Sort + into almost-alphabetical order with i386/linux at the top. + (DPKG_ARCHITECTURE): Call DPKG_CPU_TYPE and use $cpu_type instead of + $target_cpu. + * archtable: Rewrite the top comment to be a little clearer and + correct the lie that the third column is 'dpkg --print-architecture' + when it is, in fact, 'dpkg --print-gnu-build-architecture'. Correct + third columns of the non-Linux architecture to actually return a + GNU name. Sort the file into i386/linux-first alphabetical order. + +2005-01-22 Robert Millan + + * archtable: Add x86_64-kfreebsd to archtable as 'kfreebsd-amd64'. + * scripts/dpkg-architecture.pl: Add 'kfreebsd-amd64' to archtable. + +2005-01-22 NIIBE Yutaka + + * archtable: Add m32r-linux-gnu to archtable as 'm32r'. + * scripts/dpkg-architecture.pl: Add 'm32r' to archtable. + +2005-01-22 Scott James Remnant + + * src/query.c (cmdinfos): Make -f alternative for --showformat. + * src/query.c (usage): Document that -f is alternative for + --showformat. + * man/C/dpkg-query.1: Update documentation to match. + +2005-01-22 Stephane Bortzmeyer + + * scripts/dpkg-source.pl (diff_ignore_default_regexp): Add the + darcs _darcs directory to the ignore list. + +2005-01-22 Scott James Remnant + + * utils/md5sum.c (main): Correct md5sum according to the wishes + of the Debian technical committee; when given a file on standard + input, it now simply outputs the md5sum and does not append " -" + or " *-" on the end. + +2005-01-22 Adam Heath + + * lib/tarfn.c (TarExtractor): Fix handling of GNU longname and + longlink support when there is both types for the same file entry + in a tarball. + +2005-01-19 Dafydd Harries + + * man/C/dpkg-source.1: Make the summary for dpkg-source -b invocation + in the manpage match that output by dpkg-source --help. (I.e. indicate + the possibility of specifying the upstream tarball rather than the + upstream source directory as a second parameter.) + +2005-01-17 Scott James Remnant + + * debian/dpkg.preinst (confirm_dselect_split): Support pre-sarge + upgrades by checking that they've upgraded dselect first, and + prompting if they haven't. - * version-nr, debian/changelog: Release 1.10.28. - -Thu May 25 14:05:20 CEST 2005 Eddy Petrisor - - * po/ro.po: Complete translation..:-) - -Thu May 22 09:43:20 CEST 2005 Eddy Petrisor - - * po/ro.po: Better translation - -Thu May 19 07:38:20 CEST 2005 Eddy Petrisor - - * po/ro.po: Added though incomplete - * configure.in: Added Romanian to the languages list. - -Sun Apr 24 07:38:20 CEST 2005 Philippe Batailler - - * man/fr/: all man pages updated - -Wed Mar 30 14:30:20 CEST 2005 Christian Perrier - - * man/pt_BR/update-alternatives.8: Syntax error corrected - -Wed Mar 30 13:30:20 CEST 2005 eric pareja - - * po/tl.po: Added Tagalog translation - * configure.in: Added Tagalog to the languages list - -Tue Mar 08 06:30:20 CEST 2005 Christian Perrier - - * po/fr.po: Missing space added in one string - -Mon Mar 07 17:32:20 CEST 2005 Arief S Fitrianto - - * po/id.po: Completed - -Sat Feb 19 07:53:20 CEST 2005 Konstantinos Margaritis - - * po/el.po: Completed - -Thu Feb 10 15:40:04 GMT 2005 Scott James Remnant - - * version-nr, debian/changelog: Bump version to 1.10.28~. - -Thu Feb 10 15:20:27 GMT 2005 Scott James Remnant - - * version-nr, debian/changelog: Release 1.10.27. +2005-01-14 Scott James Remnant -Thu Feb 10 15:08:44 GMT 2005 Scott James Remnant + * .arch-inventory: Ignore the upload result file as well. - * configure.in (ALL_LINGUAS): Add forgetten 'id'. + * configure.ac: Bump version to 1.13.1~. -Wed Feb 09 06:30:20 CEST 2005 Christian Perrier + * configure.ac: Release 1.13.0. - * po/nl.po: Error corrected - -Sun Feb 06 19:55:54 CEST 2005 Carlos Liu - - * po/zh_CN.po: Fix errors - -Sat Feb 05 17:43:00 CEST 2005 Jacobo Tarrio - - * po/gl.po: Completed - -Sat Feb 05 17:33:00 CEST 2005 Asho Yeh - - * po/zh_TW.po: Updated - -Fri Jan 28 17:32:20 CEST 2005 Arief S Fitrianto - - * po/id.po: First version - -Fri Jan 28 10:32:20 CEST 2005 Seo Sanghyeon - - * po/ko.po: Completed - -Tue Jan 25 10:32:20 CEST 2005 Bjorn Steensrud - - * po/nb.po: Added - * configure.in: Add nb to ALL_LINGUAS. - -Tue Jan 11 17:20:33 GMT 2005 Scott James Remnant - - * version-nr, debian/changelog: Bump version to 1.10.27~. + * dpkg-deb/main.c (main): Remove NONRETURNING declaration as + this function does actually call return sometimes. + * dpkg-split/main.c (main): Remove NONRETURNING declaration as + this function does actually call return sometimes. + * utils/start-stop-daemon.c (main): Remove NONRETURNING declaration + as this function does actually call return sometimes. + * m4/compiler.m4 (SJR_COMPILER_WARNINGS): Enable warnings for CXX + too, my original macro doesn't do this. -Tue Jan 11 16:33:07 GMT 2005 Scott James Remnant - - * version-nr, debian/changelog: Release 1.10.26. - -Tue Jan 11 16:23:57 GMT 2005 Scott James Remnant - - * po/en.po: Removed dangerously out-of-date English translation, - the source is in English so this isn't required. - * configure.in: Remove en from ALL_LINGUAS. - -Mon Jan 10 06:32:20 CEST 2005 Piarres Beobide Egaña - - * po/eu.po: Updated - -Mon Jan 10 06:28:55 CEST 2005 Jordi Mallach - - * po/ca.po: Updated Catalan translation. - -Sun Jan 09 11:00:43 CEST 2005 Miguel Figueiredo - - * po/pt.po: Updated - -Sun Jan 09 07:50:00 CEST 2005 - - * po/sk.po: Updated - -Sat Jan 08 16:03:54 CEST 2005 Havard Korsvoll - - * po/nn.po: Updated - -Fri Jan 07 06:30:20 CEST 2005 Bart Cornelis - - * po/nl.po: Updated - -Fri Jan 07 06:30:20 CEST 2005 Stefano Canepa - - * po/it.po: Updated - -Thu Jan 06 20:38:20 CEST 2005 Andre Luis Lopes - - * po/pt_BR.po: Updated - -Wed Jan 05 20:21:54 CEST 2005 Bartosz Fenski aka fEnIo - - * po/pl.po: updated - -Mon Jan 03 13:42:54 CEST 2005 Michael Piefel - - * po/de.po: updated - -Sun Jan 02 07:48:43 CEST 2005 Peter Karlsson - - * po/sv.po: Updated - -Sat Jan 01 22:43:20 CEST 2005 Miroslav Kure - - * po/cs.po: Updated - -Sat Jan 01 22:41:43 CEST 2005 Claus Hindsgaul - - * po/da.po: Updated - -Sat Jan 01 11:31:43 CEST 2005 Yuri Kozlov - - * po/ru.po: Updated - -Fri Dec 31 12:12:43 CEST 2004 Javier Fernandez-Sanguino Pena - - * po/es.po: Updated - -Fri Dec 31 11:12:43 CEST 2004 Kenshi Muto - - * po/ja.po: Updated - -Fri Dec 31 07:32:01 BST 2004 Christian Perrier - - * po/fr.po: Updated French translation. - -Thu Dec 30 18:30:03 GMT 2004 Colin Watson - - * dselect/basecmds.cc: Revert to former Space/Enter/'Q' behaviour, so that - Space leaves the help screen and Enter and 'Q' do nothing. It's - dangerous to encourage users to press Enter or 'Q', since they commit - changes in the package selection screen. - * dselect/helpmsgs.cc: Update help text to match. - -Thu Dec 30 17:52:09 GMT 2004 Colin Watson - - * dselect/helpmsgs.cc: 'Q' quits and overrides dependency problems; - 'X' quits without saving changes. - -Wed Dec 29 20:34:54 CEST 2004 Christian Perrier - - * configure.in: Add eu and sk which were forgotten when these - translations were added - -Tue Dec 28 21:33:00 CEST 2004 Asho Yeh - - * po/zh_TW.po: Added - * configure.in: Added Traditional Chinese to the languages list - -Mon Dec 13 17:50:00 CEST 2004 - - * po/bs.po: Added - * configure.in: Added Bosnian to the languages list - -Mon Dec 13 17:50:00 CEST 2004 - - * po/sk.po: Updated - -Mon Nov 22 23:50:00 CEST 2004 Stefano Canepa - - * po/it.po: Updated - -Sun Nov 21 09:05:36 CEST 2004 Changwoo Ryu - - * po/ko.po: Updated - -Fri Now 19 18:19:54 CEST 2004 Christian Perrier - - * po/nl.po: Typo corrected - -Tue Nov 16 11:42:54 CEST 2004 Michael Piefel - - * po/de.po: updated - -Tue Nov 16 11:42:54 CEST 2004 Michael Piefel - - * po/de.po: updated - -Tue Nov 16 00:03:54 CEST 2004 Havard Korsvoll - - * po/nn.po: Updated - -Mon Nov 15 10:28:55 CEST 2004 Jordi Mallach - - * po/ca.po: Updated Catalan translation. - -Sun Nov 14 19:32:20 CEST 2004 Piarres Beobide Egaña - - * po/eu.po: Updated - -Sun Nov 14 17:41:20 CEST 2004 Miroslav Kure - - * po/cs.po: Updated - -Sun Nov 14 14:38:20 CEST 2004 Andre Luis Lopes - - * po/pt_BR.po: Updated - -Sun Nov 12 13:53:43 CEST 2004 Yuri Kozlov - - * po/ru.po: Updated - -Sun Nov 12 13:48:43 CEST 2004 Peter Karlsson - - * po/sv.po: Updated - -Sun Nov 12 08:10:43 CEST 2004 Kenshi Muto - - * po/ja.po: Updated - -Sat Nov 11 23:20:43 CEST 2004 Miguel Figueiredo - - * po/pt.po: Updated - -Sat Nov 11 23:18:43 CEST 2004 Claus Hindsgaul - - * po/da.po: Updated - -Sat Nov 11 23:16:43 CEST 2004 Javier Fernandez-Sanguino Pena - - * po/es.po: Updated - -Sat Nov 11 23:14:43 CEST 2004 Trorrr [Héctor Fernández] - - * po/gl.po: Updated - -Thu Nov 11 20:18:33 GMT 2004 Scott James Remnant - - * version-nr, debian/changelog: Bump version to 1.10.26~. + * configure.ac: Use AC_GNU_SOURCE to get some of the extra goodies + in the GNU C library, use DPKG_C_C99 to test for C99 features. + * m4/compiler.m4 (DPKG_C_C99): New macro to determine whether + compiler supports C99 features. + (SJR_COMPILER_WARNINGS): Don't use -pedantic yet, dpkg isn't ready + for it. + + * lib/dpkg.h: Provide C99-conformant variadic macros if the + compiler supports them in place of gnu-style ones. + * lib/tarfn.c: Add missing include of config.h to get some useful + information (and prototype of strnlen). + * src/help.c: Cast arguments to (char * const *) explicitly. + * dpkg-deb/main.c: Include dpkg-db.h to get nffreeall prototype. + * .arch-inventory: Ignore config.cache if the user uses it. + + * scripts/controllib.pl: Add #!/usr/bin/perl to satisfy lintian. + * debian/control ([dpkg]Pre-Depends): Needs to pre-depend on shlibs + dependencies like libc6, accidentally dropped earlier. + ([dpkg-dev]Recommends): Added gcc as first choice for c-compiler. + * debian/rules: Generate shlibdeps for all arch packages, not just + dselect (so we get them for dselect too). + * debian/.arch-inventory: Ignore dpkg.substvars. + * debian/dpkg.conffiles: Removed, debhelper does the right thing. + * debian/dpkg-dev.conffiles: Removed, debhelper does the right thing. + * debian/dselect.conffiles: Removed, debhelper does the right thing. + * Makefile.am (EXTRA_DIST): Updated for debian directory changes. + (package): Add missing distdir dependency, also don't treat lintian + problems as errors, just report them. + * man/C/dpkg.8: Moved to section 1 where it belongs. + * man/C/dpkg-query.8: Moved to section 1 where it belongs. + * man/C/dpkg-split.8: Moved to section 1 where it belongs. + * man/C/dselect.8: Moved to section 1 where it belongs. + * man/C/Makefile.am: Install dpkg.1, dpkg-query.1, dselect.1 + * man/es/dpkg.8: Moved to section 1 where it belongs. + * man/es/dpkg-split.8: Moved to section 1 where it belongs. + * man/es/dselect.8: Moved to section 1 where it belongs. + * man/es/Makefile.am: Install dpkg.1, dpkg-split.1, dselect.1 + * man/fr/dpkg.8: Moved to section 1 where it belongs. + * man/fr/dpkg-query.8: Moved to section 1 where it belongs. + * man/fr/dpkg-split.8: Moved to section 1 where it belongs. + * man/fr/Makefile.am: Install dpkg.1, dpkg-query.1, dpkg-split.1 + * man/ja/dpkg.8: Moved to section 1 where it belongs. + * man/ja/dpkg-query.8: Moved to section 1 where it belongs. + * man/ja/dselect.8: Moved to section 1 where it belongs. + * man/ja/Makefile.am: Install dpkg.1, dpkg-query.1, dselect.1 + * man/pt_BR/dpkg.8: Moved to section 1 where it belongs. + * man/pt_BR/dselect.8: Moved to section 1 where it belongs. + * man/pt_BR/Makefile.am: Install dselect.1, dpkg.1 + * man/ru/dpkg.8: Moved to section 1 where it belongs. + * man/ru/Makefile.am: Install dpkg.1 + * man/sv/dpkg.8: Moved to section 1 where it belongs. + * man/sv/dpkg-query.8: Moved to section 1 where it belongs. + * man/sv/dpkg-split.8: Moved to section 1 where it belongs. + * man/sv/dselect.8: Moved to section 1 where it belongs. + * man/sv/Makefile.am: Install dpkg.1, dpkg-query.1, dpkg-split.1, + dselect.1 + * debian/dpkg.install: Install dpkg.1, dpkg-query.1, dpkg-split.1 + * debian/dselect.install: Install dselect.1 + + * Makefile.am (EXTRA_DIST): Distribute files in the debian directory + in the source tarball. + (package): Create source and binary packages using dpkg-buildpackage + and some magic to give us a directory containing only 'dist' files. + Check the resulting changes file with lintian if we have it. + + * .arch-inventory: Apply l33t regex skills to ignore source tarballs, + packages and the dist directory. + + * utils/Makefile.am (rootsbin_PROGRAMS): Install start-stop-daemon + into the ordinary sbindir by default. + * debian/dpkg.install: Install usr/sbin/start-stop-daemon into /sbin. + + * debian/control (Build-Depends): The source tarball now includes + the generated gmo files, so there's no reason for the package to + build-depend on gettext. + + * getopt/getdate.c: Remove unused file. + + * methods/disk/update: Remove {...} glob, as it's a bashism. + + * debian/control (Build-Depends): Fix dependency on virtual + package `libncurses-dev'. + + * m4/funcs.m4 (DPKG_FUNC_VA_COPY): Wrap TRY_RUN and TRY_COMPILE + calls in AC_CACHE_CHECK, missed when I copied it over and updated. + + * debian/dpkg.prerm: Give the script a bit of a spring clean, + add a comment block at the top to serve as documentation of how + prerm is called for anyone wanting a quick reference; this seems + a reasonable place to do it as any. Don't remove the historic + info scripts anymore (dating back to 1.3.3) as we haven't shipped + them in ages and 1.3.3's upgrade script did it anyway. + * debian/dpkg.postrm: Equal spring clean and documentation comment + added to the top. Removed code to purge dpkg.cfg now we include it + in the package as a conffile again anyway. + * debian/dpkg.preinst: Equal spring clean and documentation comment + added to the top. Separated each discreet piece of upgrade behaviour + for the 0.93.50 jump into different functions. + * debian/dpkg.postinst: Equal spring clean and documentation comment + added to the top. Separated each bit of behaviour into a separate + function. + (move_info_directory): No longer create symlinks to the new location. + (remove_info_symlink): Remove /usr/info or /usr/info/dir symlinks. + +2005-01-13 Scott James Remnant + + * debian/control (Build-Depends): Add forgotten build-depend on + debhelper, I picked 4.1.81 after reading the changelog as it has the + first feature we need (upstream and debian changelogs in a native + package). + + * man/C/Makefile.am (dpkg_source_aliases): I missed a whole bunch + of manpages created as aliases to dpkg-source, put the rules in to + do that. + * man/C/.arch-inventory: Ignore generated aliased pages. + + * debian/rules: Rewrite from scratch to use debhelper, this breaks + being able to bootstrap dpkg from its own source directory; but that + didn't really work anyway. You can always just 'make install' first. + * debian/compat: Set debhelper compatibility to v4. + * debian/dpkg.docs: List documentation to ship with dpkg. + * debian/dpkg.install: List files that belong to dpkg. + * debian/dselect.install: List files that belong to dselect. + * debian/dpkg-dev.install: List files that belong to dpkg-dev. + * .arch-inventory: Ignore build-tree, created by debian/rules. + * debian/.arch-inventory: Ignore files and directories created by + debian/rules. + + * lib/Makefile.am (INCLUDES): Correct sharedstatedir to datadir, + common-licenses isn't in /usr/com (whatever that is). + + * dpkg-split/Makefile.am (install-data-local): Use $(mkdir_p) instead + of $(MKINSTALLDIRS), better style. + * methods/Makefile.am (install-data-local): Use $(mkdir_p) instead of + $(MKINSTALLDIRS) here too. + * origins/Makefile.am (install-data-local): And here. + * scripts/Makefile.am (install-exec-local): Here as well. + (install-data-local): Likewise. + * src/Makefile.am (install-data-local): And finally, here too. + + * scripts/Makefile.am: Automake doesn't create out-of-tree output + directories for us, so do so if it they don't exist (but quiet, like). + (do_perl_subst): Remove space in #! line. + * dpkg-split/Makefile.am: Create out-of-tree directories. + (do_perl_subst): Remove space in #! line. + + * lib/dpkg.h: Include locale.h, for LC_ALL which is expanded in + a macro here. This is needed if we build without optimisations + as libintl.h won't include it for us. + +2005-01-12 Scott James Remnant + + * debian/pseudo-tags: Rewrite and clear up, put tags into a decent + order and add a new [DEPENDS] tag to track dependency handling + issues. + + * debian/shlibs.default: Clean up. + * debian/shlibs.override: Clean up. + + * debian/dselect.cfg: Clean up atrocious English spelling. + * debian/dpkg.cfg: Clean up atrocious English spelling; remove old + configuration values as this file would be useful to be installed + to describe its use. + * debian/dpkg.conffiles: Add dpkg.cfg. + + * debian/copyright: Clean up, utf-8ify and add missing copyright + declarations. + + * debian/control (Build-Depends): Remove SGML-related tools now we no + longer have docs in that format; increase gettext build-dependency to + 0.14.1; remove build-dependency on autotools-dev. + (Standards-Version): Bump to keep lintian happy, we're conformant. + ([dpkg]Pre-Depends): Remove pre-dependency on dselect put in place + to ease transition between woody and sarge where dselect was split + into a separate binary package. + ([dpkg]Suggests): It's about time we suggested apt. + ([dpkg]Description): The dselect program is no longer included in the + dpkg package, so don't mention it in the description. + ([dselect]Description): Rewrite as dselect is no longer the primary + interface for package management, and that users may prefer apt-based + interfaces. + + * debian/control (dpkg-static): The dpkg (and dpkg-deb) binaries + have been linked statically to zlib for some time, and the + dpkg-static package hasn't actually been created either. Remove + from the control file. + + * debian/control (dpkg-doc): The documentation shipped in the + dpkg-doc package was rather incomplete and out-of-date, so was + removed from the distribution. Remove package from control file. + * debian/dpkg-doc.doc-base: Remove dpkg-doc file. + * debian/dpkg-doc.postinst: Remove dpkg-doc maintainer script. + * debian/dpkg-doc.prerm: Remove dpkg-doc maintainer script. + * debian/README.compile: Removed this file as it's both out of + date, and entirely replaced by Build-Depends anyway for those + that care about such things. + + * Makefile.am: Remove rules to install common documentation and + licence under /usr/share/doc/dpkg, leave that up to the package. + * lib/Makefile.am (INCLUDES): Define COPYINGFILE to point to + /usr/share/common-licenses/GPL-2. + +2005-01-11 Colin Watson + + * dselect/basecmds.cc (baselist::displayhelp) Revert to former + Space/Enter/'Q' behaviour, so that Space leaves the help screen + and Enter and 'Q' do nothing. It's dangerous to encourage users + to press Enter or 'Q', since they commit changes in the package + selection screen. + * dselect/helpmsgs.cc (hlp_readonlyintro, hlp_recurintro): Update + help text to match. + (hlp_mainintro): 'Q' quits and overrides dependency problems; + 'X' quits without saving changes. + +2005-01-10 Scott James Remnant + + * configure.ac: Fix --without-dselect and --without-start-stop-daemon + so they actually work, Autoconf was preserving the old value of the + variable. Always call AC_PROG_CXX otherwise things aren't happy + as it gets partially expanded. + + * dpkg-split/Makefile.am (EXTRA_DIST): Distribute mksplit.pl. + * dselect/Makefile.am (EXTRA_DIST): Distribute mkcurkeys.pl. + * lib/Makefile.am (libdpkg_a_SOURCES): Distribute gettext.h. + * scripts/Makefile.am (EXTRA_DIST): Distribute the scripts and + README.alternatives, oops. + (all-local): Build install-info from install-info.pl manually. + (install-exec-local): Install install-info manually. + (uninstall-local): Remove install-info manually. + * scripts/.arch-inventory: Ignore install-info-stamp file we need. + * src/Makefile.am (dpkg_query_SOURCES): There is no errors.h. + + * Makefile.conf.in: Remove file used by old build system. + + * lib/mlib.c (buffer_write): Remove cast from lvalue, deprecated + in recent versions of gcc. + * m4/compiler.m4 (SJR_COMPILER_OPTIMISATIONS): Explicitly set -O0 + when disabling compiler optimisations, as recent versions of gcc + have some on by default. + + Now we're not using CVS at all, replace the old .cvsignore files + with .arch-inventory files Arch can use to ignore generated files. + + * .cvsignore: Remove old file. + * .arch-inventory: Replace with more complete regex rules. + * dpkg-deb/.cvsignore: Remove old file. + * dpkg-deb/.arch-inventory: Replace with more complete regex rules. + * dpkg-split/.cvsignore: Remove old file. + * dpkg-split/.arch-inventory: Replace with more complete regex rules. + * dselect/.cvsignore: Remove old file. + * dselect/.arch-inventory: Replace with more complete regex rules. + * getopt/.cvsignore: Remove old file. + * getopt/.arch-inventory: Replace with more complete regex rules. + * lib/.cvsignore: Remove old file. + * lib/.arch-inventory: Replace with more complete regex rules. + * m4/.arch-inventory: Ignore files copied in by 'autopoint'. + * man/.cvsignore: Remove old file. + * man/.arch-inventory: Replace with more complete regex rules. + * man/C/.cvsignore: Remove old file. + * man/C/.arch-inventory: Replace with more complete regex rules. + * man/de/.cvsignore: Remove old file. + * man/de/.arch-inventory: Replace with more complete regex rules. + * man/es/.arch-inventory: Ignore generated 'Makefile' and 'Makefile.in'. + * man/fr/.cvsignore: Remove old file. + * man/fr/.arch-inventory: Replace with more complete regex rules. + * man/ja/.cvsignore: Remove old file. + * man/ja/.arch-inventory: Replace with more complete regex rules. + * man/pt_BR/.cvsignore: Remove old file. + * man/pt_BR/.arch-inventory: Replace with more complete regex rules. + * man/ru/.cvsignore: Remove old file. + * man/ru/.arch-inventory: Replace with more complete regex rules. + * man/sv/.cvsignore: Remove old file. + * man/sv/.arch-inventory: Replace with more complete regex rules. + * methods/.cvsignore: Remove old file. + * methods/.arch-inventory: Replace with more complete regex rules. + * origins/.arch-inventory: Ignore generated 'Makefile' + and 'Makefile.in'. + * po/.cvsignore: Remove old file. + * po/.arch-inventory: Replace with more complete regex rules. + * scripts/.cvsignore: Remove old file. + * scripts/.arch-inventory: Replace with more complete regex rules. + * scripts/changelog/.arch-inventory: Ignore generated file. + * src/.cvsignore: Remove old file. + * src/.arch-inventory: Replace with more complete regex rules. + * utils/.cvsignore: Remove old file. + * utils/.arch-inventory: Replace with more complete regex rules. + + * man/sv/.check.pl: Remove as it uses CVS to check whether the + translations are up to date, and we don't use that anymore. + * dselect/checkunimp.pl: Remove unused file. + * dselect/keys.c: Remove unused file. + + For at least the second time in dpkg's history, convert the build + system to use GNU Automake. I'm sure some future maintainer will + come along and get rid of it again, but for now, Automake is the + way forward. + + * Makefile.in: Remove old file. + * Makefile.am: Replace with shiny Automake goodness, don't distribute + TODO anymore; it's only useful for developers. + * dpkg-deb/Makefile.in: Remove old file. + * dpkg-deb/Makefile.am: Replace with shiny Automake goodness, don't + include rules to build dpkg-deb-static. + * dpkg-split/Makefile.in: Remove old file. + * dpkg-split/Makefile.am: Replace with shiny Automake goodness. + * dselect/Makefile.in: Remove old file. + * dselect/Makefile.am: Replace with shiny Automake goodness. + * getopt/Makefile.in: Remove old file. + * getopt/Makefile.am: Replace with shiny Automake goodness. + * lib/Makefile.in: Remove old file. + * lib/Makefile.am: Replace with shiny Automake goodness. + (libdpkg_a_SOURCES): add refugee files from 'include'. + * man/Makefile.in: Remove old file. + * man/Makefile.am: Replace with shiny Automake goodness. + * man/C/Makefile.in: Remove old file. + * man/C/Makefile.am: Replace with shiny Automake goodness. + * man/de/Makefile.in: Remove old file. + * man/de/Makefile.am: Replace with shiny Automake goodness. + * man/es/Makefile.in: Remove old file. + * man/es/Makefile.am: Replace with shiny Automake goodness. + * man/fr/Makefile.in: Remove old file. + * man/fr/Makefile.am: Replace with shiny Automake goodness. + * man/ja/Makefile.in: Remove old file. + * man/ja/Makefile.am: Replace with shiny Automake goodness. + * man/pt_BR/Makefile.in: Remove old file. + * man/pt_BR/Makefile.am: Replace with shiny Automake goodness. + * man/ru/Makefile.in: Remove old file. + * man/ru/Makefile.am: Replace with shiny Automake goodness. + * man/sv/Makefile.in: Remove old file. + * man/sv/Makefile.am: Replace with shiny Automake goodness. + * methods/Makefile.in: Remove old file. + * methods/Makefile.am: Replace with shiny Automake goodness, taking + into account the new filesystem structure. + * origins/Makefile.am: New Automake file to install origin files. + * scripts/Makefile.in: Remove old file. + * scripts/Makefile.am: Replace with shiny Automake goodness. + * src/Makefile.in: Remove old file. + * src/Makefile.am: Replace with shiny Automake goodness, don't + include rules to build either dpkg-static or dpkg-query-static. + * utils/Makefile.in: Remove old file. + * utils/Makefile.am: Replace with shiny Automake goodness, don't + include rules to build md5sum-static. + + * dpkg-deb/build.c: Replace USE_ZLIB with WITH_ZLIB. + * dpkg-deb/extract.c: Replace USE_ZLIB with WITH_ZLIB. + * dpkg-deb/main.c: Remove version.h include. + * dpkg-split/main.c: Remove version.h include. + * dselect/main.cc: Remove version.h include. + * lib/compression.c: Replace USE_ZLIB with WITH_ZLIB and USE_BZ2 + with WITH_ZLIB. + * src/help.c: Remove version.h include and replace + USE_START_STOP_DAEMON with WITH_START_STOP_DAEMON. + * src/main.c: Remove version.h include. + + We're going to move to using 'autoreconf' to generate the build + scripts after a checkout and 'make dist' to get a clean tarball. + Various files will get copied automatically so there's no point + having them under version control, they'll still appear in the + tarballs though. + + * INSTALL: Remove from version control. + * config.guess: Remove from version control. + * config.sub: Remove from version control. + * install-sh: Remove from version control. + * autogen.sh: Remove unnecessary script, just run 'autoreconf'. + * release.sh: Remove unnecessary script, just run 'make dist'. + + The old 'configure.in' arranged for a bunch of code to be added + to the bottom of 'config.h' with the assumption that it'd be + included everywhere. That's not good style, the file is only + supposed to contain settings and not real code. Put the code in + real header files and source. + + * lib/dpkg.h: Include and if available. + (INTERPRETER_MAX): Define to PATH_MAX or 1024 if not available. + (DPKG_VERSION_ARCH): Define using PACKAGE_VERSION instead of + DPKG_VERSION, which no longer exists. + (ADMINDIR): Remove definition, define in Makefiles where needed. + (CONFIGDIR): Remove definition, define in Makefiles where needed. + (LIBDIR): Remove definition, define in Makefiles where needed. + (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED, NONRETURNPRINTFFORMAT): + Define attribute markers used in function prototypes. + (strerror, strsignal, scandir, alphasort, unsetenv): Define prototypes + for functions in 'compat.c' if the system lacks them. + (strtoul, va_copy, WCOREDUMP): Provide compatible macros for functions + the system lacks. + (BUILDOLDPKGFORMAT): Define here. + (_, N_): Include gettext.h and define friendlier macros. + * lib/gettext.h: Include from gettext distribution useful header + file that does the heavy lifting of enabling or disabling gettext. + * lib/md5.h: Add code to define UWORD32 used by this implementation. + * getopt/error.h (error, error_at_line): Remove printf format + attribute marker from prototypes to keep the code clean. + * getopt/getopt.c (store_args_and_env): Remove unused attribute + marker from function to keep the code clean. + * utils/md5sum.c: Let gettext.h (included through dpkg.h) do the + heavy lifting and define the right things for us. + * utils/start-stop-daemon.c: Duplicate includes of + and along with attribute marker definitions to avoid + having to include 'dpkg.h'. + + * configure.in: Rename to 'configure.ac' and rewrite from the + ground-up with Autoconf 2.59 in mind. + * m4/arch.m4: New file of macros for 'configure.ac': + (DPKG_OS_TYPE): Code from old 'configure.in' to turn output from + 'config.guess' into an operating system name we recognise. + (DPKG_ARCHITECTURE): Code from old 'configure.in' to look up + CPU and operating system name in the 'archtable'. + * m4/compiler.m4: New file of macros for 'configure.ac': + (SJR_COMPILER_WARNINGS): Add my standard macro to enable additional + compiler warnings and treat them as errors. + (SJR_COMPILER_OPTIMISATIONS): Add my standard macro to allow + disabling of optimisations. + (DPKG_C_ATTRIBUTE): Macro to check whether the C compiler supports + __attribute__, we assume that compilers that do ignore unknown + attributes like gcc does. + * m4/funcs.m4: New file of macros for 'configure.ac': + (DPKG_FUNC_VA_COPY): Code from old 'configure.in' to determine + whether the system supports va_copy or directly copying the values. + * m4/libs.m4: New file of macros for 'configure.ac': + (DPKG_LIB_ZLIB): Rework of old 'configure.in' code to allow the + user to decide whether to use zlib, and whether to link it statically. + (DPKG_LIB_BZ2): Rework of old 'configure.in' code to allow the user + to decide whether to use the bz2 library, and whether to link it + statically. + (DPKG_LIB_CURSES): Code from old 'configure.in' to pick the right + curses library on the system. + (DPKG_LIB_SSD): Code from old 'configure.in' to look for libraries + used by start-stop-daemon. + * m4/linker.m4: New file of macros for 'configure.ac': + (SJR_LINKER_OPTIMISATIONS): Add my standard macro to enable linker + optimisations and allow them to be disabled. + * m4/perl.m4: New file of macros for 'configure.ac': + (DPKG_PROG_PERL): Macro to locate the Perl interpreter in the PATH, + or allow the user to specify it with PERL=. + * m4/types.m4: New file of macros for 'configure.ac': + (DPKG_TYPE_PTRDIFF_T): Macro to replace obsolete AC_TYPE_PTRDIFF_T + macro from Autoconf. + (DPKG_DECL_SYS_SIGLIST): Macro to replace obsolete AC_DECL_SYS_SIGLIST + macro from Autoconf. + (DPKG_CHECK_DEFINE): Rework of old 'automake/dpkg.m4' code. + * version-nr: Remove, version should be changed in configure.ac + directly. + * automake: Remove older Autoconf macros. + + * po/ChangeLog: Add new ChangeLog to describe changes affecting + translations and their infrastructure. + + * origin: Move to 'origins/debian' so we can ship additional + origins in future. + + Rearrange changelog parsers under 'scripts' into a separate + directory so they also don't need to be renamed on installation. + + * scripts/cl-debian.pl: Move to 'scripts/changelog/debian.pl'. + + Rearrange 'methods' directory into the same hierarchy used when + installed to save having to rename files on installation. + + * methods/disk.desc.cdrom: Move to 'methods/disk/desc.cdrom'. + * methods/disk.desc.harddisk: Move to 'methods/disk/desc.harddisk'. + * methods/disk.desc.mounted: Move to 'methods/disk/desc.mounted'. + * methods/disk.desc.nfs: Move to 'methods/disk/desc.nfs'. + * methods/disk.install: Move to 'methods/disk/install' and chmod +x. + * methods/disk.names: Move to 'methods/disk/names'. + * methods/disk.setup: Move to 'methods/disk/setup' and chmod +x. + * methods/disk.update: Move to 'methods/disk/update' and chmod +x. + * methods/floppy.desc.floppy: Move to 'methods/floppy/desc.floppy'. + * methods/floppy.install: Move to 'methods/floppy/install' and + chmod +x. + * methods/floppy.names: Move to 'methods/floppy/names'. + * methods/floppy.setup: Move to 'methods/floppy/setup' and chmod +x. + * methods/floppy.update: Move to 'methods/floppy/update' and chmod +x. + * methods/hd.setup: Remove unused method script. + * methods/hd.unpack: Remove unused method script. + * methods/hd.update: Remove unused method script. + + Consolidate the library code into one directory, so the headers are + alongside the code rather than somewhere else. + + * include/dpkg-db.h: Move to 'lib'. + * include/myopt.h: Move to 'lib'. + * include/parsedump.h: Move to 'lib'. + * include/tarfn.h: Move to 'lib'. + * include/dpkg.h.in: Move to 'lib' and rename to 'dpkg.h', we'll + set ADMINDIR, CONFIGDIR and LIBDIR in Makefile where needed as they + can contain shell paths. + * include: Remove directory. + + * AUTHORS: Add new file detailing the original authors of dpkg and + the maintainers through the years. + * COPYING: Update to include correct FSF address. + * NEWS: Add new file that just points to debian/changelog for major + changes between releases. + * README: Add new file to briefly describe the package. + + Instead of scattering manpages throughout the source, we'll keep + all of the original pages in one place under 'man/C'. This should + make it easier to keep track of them, especially translators. + + * dpkg-deb/dpkg-deb.1: Move to 'man/C'. + * dpkg-split/dpkg-split.8: Move to 'man/C'. + * dselect/dselect.8: Move to 'man/C'. + * scripts/822-date.1: Move to 'man/C'. + * scripts/cleanup-info.8: Move to 'man/C'. + * scripts/dpkg-architecture.1: Move to 'man/C'. + * scripts/dpkg-checkbuilddeps.1: Move to 'man/C'. + * scripts/dpkg-divert.8: Move to 'man/C'. + * scripts/dpkg-name.1: Move to 'man/C'. + * scripts/dpkg-scanpackages.1: Move to 'man/C'. + * scripts/dpkg-scansources.1: Move to 'man/C'. + * scripts/dpkg-source.1: Move to 'man/C'. + * scripts/dpkg-statoverride.8: Move to 'man/C'. + * scripts/install-info.8: Move to 'man/C'. + * scripts/update-alternatives.8: Move to 'man/C'. + * src/dpkg-query.8: Move to 'man/C'. + * src/dpkg.8: Move to 'man/C'. + * utils/md5sum.1: Move to 'man/C'. + * utils/start-stop-daemon.8: Move to 'man/C'. + + * man/en: Rename directory to 'man/C', reserving country codes for + manpages that have actually undergone translation. These are the + "original" format, and like the strings in the code itself don't + really belong to any particular locale. + + Continuing the spirit of having only one markup format for manpages, + fix up the two generated from POD and remove the POD. + + * scripts/dpkg-architecture.1: Generate with pod2man and remove + damage from the top, turning it into respectable nroff. + * scripts/dpkg-architecture.pl: Remove POD documentation from script. + * scripts/dpkg-scansources.1: Generate with pod2man and remove + damage from the top, turning it into respectable nroff. + * scripts/dpkg-scansources.pl: Remove POD documentation from script. + + Remove the SGML files containing the same content as the manpages, + but which were never used to generate them. This avoids confusion, + and as one markup format is just as good as another, we'll settle + on nroff's man format. + + * man/en/cleanup-info.8.sgml: Remove SGML format documentation. + * man/en/deb-control.5.sgml: Remove SGML format documentation. + * man/en/deb-old.5.sgml: Remove SGML format documentation. + * man/en/deb.5.sgml: Remove SGML format documentation. + * man/en/dpkg-checkbuilddeps.1.sgml: Remove SGML format documentation. + * man/en/dpkg.8.sgml: Remove SGML format documentation. + * man/en/dpkg.cfg.5.sgml: Remove SGML format documentation. + * man/en/dselect.8.sgml: Remove SGML format documentation. + * man/en/dselect.cfg.5.sgml: Remove SGML format documentation. + * man/paths.ent.in: Remove now we have no SGML format pages. + + * attic: Remove historical interest directory, that's what version + control is for. + * doc: Remove obsolete, incomplete and out-of-date documentation + including that licenced under the GFDL (ie the entire directory). + * md5sum: Remove empty directory. + + * main: Rename directory to 'src' so it's consistent with 'lib'. + * optlib: Rename directory to 'getopt' as that's what's really in it. + * split: Rename directory to 'dpkg-split' so it's consistent with + 'dpkg-deb'. Tue Nov 09 15:23:54 CEST 2004 Christian Perrier @@ -302,6 +755,24 @@ Thu Oct 28 15:55:14 BST 2004 Scott James Remnant * dpkg-deb/dpkg-deb.h: Add '/' onto the end of the COMPAT values for bzip2 and tar. +Wed Oct 27 12:22:08 BST 2004 Scott James Remnant + + * version-nr, debian/changelog: Bump version to 1.13~. + +Wed Oct 27 10:14:29 BST 2004 Scott James Remnant + + * version-nr, debian/changelog: Bump version to 1.10.25~. + +Wed Oct 27 09:58:27 BST 2004 Scott James Remnant + + * lib/compression.c: Which revealed some brown-paper bag issues: + Replace "BZFILE" with "BZFILE *", "file" with "bzfile" + and "bzdopen" to "BZ2_bzdopen". + +Wed Oct 27 09:49:15 BST 2004 Scott James Remnant + + * lib/compression.c: Replace USE_BZ2 with USE_BZ2LIB to match configure.in. + Tue Oct 26 19:24:54 CEST 2004 Havard Korsvoll * po/nn.po: Updated diff --git a/INSTALL b/INSTALL index 3b50ea95..54caf7c1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,9 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation ================== @@ -8,20 +14,27 @@ various system-dependent variables used during compilation. It uses those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -31,7 +44,7 @@ The simplest way to compile this package is: `sh ./configure' instead to prevent `csh' from trying to execute `configure' itself. - Running `configure' takes a while. While running, it prints some + Running `configure' takes awhile. While running, it prints some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -55,14 +68,16 @@ Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== @@ -75,11 +90,11 @@ directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== @@ -95,6 +110,11 @@ give `configure' the option `--exec-prefix=PATH', the package will use PATH as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. @@ -117,22 +137,32 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. - If you are building compiler tools for cross-compiling, you can also + If you are _building_ compiler tools for cross-compiling, you should use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ @@ -145,32 +175,55 @@ default values for variables like `CC', `cache_file', and `prefix'. `CONFIG_SITE' environment variable to the location of the site script. A warning: not all `configure' scripts look for a site script. -Operation Controls +Defining Variables ================== + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + `configure' recognizes the following options to control how it operates. -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - `--help' +`-h' Print a summary of the options to `configure', and exit. +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' `-q' - Do not print messages saying which checks are being made. + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). `--srcdir=DIR' Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..63cb767a --- /dev/null +++ b/Makefile.am @@ -0,0 +1,73 @@ +## Process this file with automake to produce Makefile.in + +if WITH_DSELECT + MAYBE_DSELECT = dselect +endif + +SUBDIRS = \ + intl \ + getopt \ + lib \ + src \ + $(MAYBE_DSELECT) \ + dpkg-deb \ + dpkg-split \ + utils \ + scripts \ + po \ + methods \ + origins \ + man + +ACLOCAL_AMFLAGS = -I m4 + + +dist_pkgdata_DATA = archtable + +EXTRA_DIST = \ + debian/changelog \ + debian/compat \ + debian/control \ + debian/copyright \ + debian/dpkg-dev.install \ + debian/dpkg.cfg \ + debian/dpkg.docs \ + debian/dpkg.install \ + debian/dpkg.postinst \ + debian/dpkg.postrm \ + debian/dpkg.preinst \ + debian/dpkg.prerm \ + debian/dselect.cfg \ + debian/dselect.install \ + debian/pseudo-tags \ + debian/rules \ + debian/shlibs.default \ + debian/shlibs.override + + +GAIN_ROOT_COMMAND=fakeroot +TARGET_ARGS= +DPKG_BUILDPACKAGE_ARGS= +LINTIAN_ARGS= + +package: distdir + cd $(distdir) && dpkg-buildpackage \ + -r$(GAIN_ROOT_COMMAND) \ + $(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS) + $(am__remove_distdir) + @set -e; \ + if test "x$(TARGET_ARGS)" = "x-S"; then \ + arch=source; \ + else \ + arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \ + fi; \ + changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \ + test -f $$changes || { echo $$changes missing; exit 1;}; \ + if which lintian >/dev/null; then \ + echo lintian $(LINTIAN_ARGS) $$changes; \ + lintian $(LINTIAN_ARGS) $$changes || true; \ + fi; \ + (echo "$(distdir) package files ready for upload: "; \ + echo $$changes; \ + sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' diff --git a/Makefile.conf.in b/Makefile.conf.in deleted file mode 100644 index e05ce8cd..00000000 --- a/Makefile.conf.in +++ /dev/null @@ -1,101 +0,0 @@ - -# What are we building anyway? -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -# Directory settings -prefix = @prefix@ -exec_prefix = $(prefix) -sharedir = $(prefix)/share - -docdir = $(sharedir)/doc/$(PACKAGE) -copyingfile = $(docdir)/copyright -infodir = @infodir@ - -datadir = @datadir@ -localedir = $(datadir)/locale -bindir = @bindir@ -sbindir = @sbindir@ - -libdir = @libdir@ -dpkglibdir = $(libdir)/$(PACKAGE) -dpkgsharedir = $(sharedir)/$(PACKAGE) - -methodsdir = $(dpkglibdir)/methods -parsechangelogdir = $(dpkglibdir)/parsechangelog - -admindir = @admindir@ - -mandir = @mandir@ -man1dir = $(mandir)/man1 -man5dir = $(mandir)/man5 -man8dir = $(mandir)/man8 - -sysconfdir = @sysconfdir@ -dpkgconfdir = $(sysconfdir)/$(PACKAGE) -alternativesdir = $(sysconfdir)/alternatives - -abs_builddir = @abs_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ifeq ($(strip $(srcdir)),$(strip $(top_srcdir))) -subdir = -else -subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/ -endif -PERL = @PERL@ -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -LN = @LN_S@ -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -SED = @SED@ -RM = @RM@ - -CC = @CC@ -CFLAGS = @CFLAGS@ @CWARNS@ - -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ - -CPPFLAGS = @CPPFLAGS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -L../lib -L../optlib -LIBS = @LIBS@ -ldpkg -lopt $(ZLIB_LIBS) $(BZ2LIB_LIBS) - -RANLIB = @RANLIB@ - -DEFS = @DEFS@ -D_GNU_SOURCE -INCLUDE_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I. -I$(top_srcdir)/optlib - -NLS_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl -NLS_LIBS = @INTLLIBS@ - -SSD_LIBS = @SSD_LIBS@ - -CURSES_LIBS = @CURSES_LIBS@ - -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -ZLIB_LIBS_ALSO_STATIC = @ZLIB_LIBS_ALSO_STATIC@ - -BZ2LIB_CFLAGS = @BZ2LIB_CFLAGS@ -BZ2LIB_LIBS = @BZ2LIB_LIBS@ -BZ2LIB_LIBS_ALSO_STATIC = @BZ2LIB_LIBS_ALSO_STATIC@ - -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(DEFS) $(NLS_CFLAGS) $(INCLUDE_CFLAGS) $(ZLIB_CFLAGS) $(BZ2LIB_CFLAGS) -ALL_CXXFLAGS = $(ALL_CFLAGS) $(CXXFLAGS) - -ALSO_STATIC = @ALSO_STATIC@ -.c.o: - $(CC) $(ALL_CFLAGS) -c $< - -.cc.o: - $(CXX) $(ALL_CXXFLAGS) -c $< - -Makefile: $(srcdir)/Makefile.in - (cd $(abs_builddir);CONFIG_FILES=$(subdir)$@ $(abs_builddir)/config.status) - -foobar: - @echo "srcdir='$(srcdir)'" - @echo "subdir='$(subdir)'" diff --git a/Makefile.in b/Makefile.in index d88e35ac..22af3c33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,40 +1,728 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -VERSION = $(shell cat version-nr) +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -GENFILES = version.h +# 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. -default: all -include Makefile.conf +@SET_MAKE@ -SUBDIRS = include optlib lib dpkg-deb split scripts utils main \ - @DSELECTDIR@ po methods man doc +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(top_srcdir)/configure \ + $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \ + ChangeLog INSTALL NEWS THANKS TODO config.guess config.rpath \ + config.sub depcomp install-sh missing mkinstalldirs +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = intl/Makefile +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +am__installdirs = "$(DESTDIR)$(pkgdatadir)" +dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_pkgdata_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = intl getopt lib src dselect dpkg-deb dpkg-split utils \ + scripts po methods origins man +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +@WITH_DSELECT_TRUE@MAYBE_DSELECT = dselect +SUBDIRS = \ + intl \ + getopt \ + lib \ + src \ + $(MAYBE_DSELECT) \ + dpkg-deb \ + dpkg-split \ + utils \ + scripts \ + po \ + methods \ + origins \ + man -all: version.h all-recursive +ACLOCAL_AMFLAGS = -I m4 +dist_pkgdata_DATA = archtable +EXTRA_DIST = \ + debian/changelog \ + debian/compat \ + debian/control \ + debian/copyright \ + debian/dpkg-dev.install \ + debian/dpkg.cfg \ + debian/dpkg.docs \ + debian/dpkg.install \ + debian/dpkg.postinst \ + debian/dpkg.postrm \ + debian/dpkg.preinst \ + debian/dpkg.prerm \ + debian/dselect.cfg \ + debian/dselect.install \ + debian/pseudo-tags \ + debian/rules \ + debian/shlibs.default \ + debian/shlibs.override -install: all install-recursive - $(mkinstalldirs) $(DESTDIR)$(dpkgconfdir)/origins - $(mkinstalldirs) $(DESTDIR)$(dpkgsharedir)/origins - $(INSTALL_DATA) $(srcdir)/origin $(DESTDIR)$(dpkgconfdir)/origins/debian - $(INSTALL_DATA) $(srcdir)/archtable $(DESTDIR)$(dpkgsharedir)/archtable +GAIN_ROOT_COMMAND = fakeroot +TARGET_ARGS = +DPKG_BUILDPACKAGE_ARGS = +LINTIAN_ARGS = +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 +intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +uninstall-info-am: +install-dist_pkgdataDATA: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done + +uninstall-dist_pkgdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (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. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + 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; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) + $(mkdir_p) $(distdir)/debian $(distdir)/intl $(distdir)/m4 $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ + distdir) \ + || 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-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + --with-included-gettext \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(pkgdatadir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive - rm -f $(GENFILES) -distclean: clean distclean-recursive - rm -f Makefile.conf Makefile config.cache config.h config.log config.status - rm -f automake/gettext.m4 automake/progtest.m4 automake/lcmessage.m4 +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-dist_pkgdataDATA + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am -version.h: version-nr - echo "#define DPKG_VERSION \"$(VERSION)\" /* This line modified by Makefile */" > version.h +uninstall-info: uninstall-info-recursive -all-recursive install-recursive clean-recursive distclean-recursive: %-recursive: - $(MAKE) $(MFLAGS) $(patsubst %,$*-%,$(SUBDIRS)) +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-recursive distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_pkgdataDATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-dist_pkgdataDATA \ + uninstall-info-am -$(foreach target,all install clean distclean,$(patsubst %,$(target)-%,$(SUBDIRS))): - $(MAKE) $(MFLAGS) -C "$(shell echo "$@" | sed 's/[^-]*-//')" "$(shell echo "$@" | sed 's/-.*//')" -.PHONY: all install clean distclean -.PHONY: all-recursive install-recursive clean-recursive distclean-recursive +package: distdir + cd $(distdir) && dpkg-buildpackage \ + -r$(GAIN_ROOT_COMMAND) \ + $(TARGET_ARGS) $(DPKG_BUILDPACKAGE_ARGS) + $(am__remove_distdir) + @set -e; \ + if test "x$(TARGET_ARGS)" = "x-S"; then \ + arch=source; \ + else \ + arch=`dpkg-architecture $(TARGET_ARGS) -qDEB_HOST_ARCH`; \ + fi; \ + changes=$(PACKAGE)_$(VERSION)_$$arch.changes; \ + test -f $$changes || { echo $$changes missing; exit 1;}; \ + if which lintian >/dev/null; then \ + echo lintian $(LINTIAN_ARGS) $$changes; \ + lintian $(LINTIAN_ARGS) $$changes || true; \ + fi; \ + (echo "$(distdir) package files ready for upload: "; \ + echo $$changes; \ + sed -e '1,/^Files:/d;/^$$/,$$d;s/.* //g' $$changes) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +# 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/NEWS b/NEWS new file mode 100644 index 00000000..de770e12 --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ +See debian/changelog for major changes between dpkg releases. diff --git a/README b/README new file mode 100644 index 00000000..aaaa429d --- /dev/null +++ b/README @@ -0,0 +1,5 @@ +This is dpkg, Debian's package maintenance system. + +The primary interface for the dpkg suite is the `dselect' program; +a more low-level and less user-friendly interface is available in +the form of the `dpkg' command. diff --git a/aclocal.m4 b/aclocal.m4 index d86aee19..a8cfe010 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -11,2042 +11,757 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# gettext.m4 serial 34 (gettext-0.14.2) -dnl Copyright (C) 1995-2005 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. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that don't -dnl support the ISO C 99 formatstring macros will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AM_NLS - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi +# 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. - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi +# 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. - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi +# 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 - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) - if test "$USE_NLS" = "yes"; then +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.8.5])]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi +# AM_AUX_DIR_EXPAND - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - dnl We need to process the po/ directory. - POSUB=po - fi +# 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. - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi +# 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. - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) +# 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. - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= +# 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], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) +# AM_CONDITIONAL -*- Autoconf -*- - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) +# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) +# 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. - dnl For backward compatibility. Some Makefiles may be using this. - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) +# 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. - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) +# 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. - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) +# serial 6 - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) +# serial 7 -*- Autoconf -*- -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ -mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ -strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ -__fsetlocking]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. - AM_ICONV - AM_LANGINFO_CODESET - if test $ac_cv_header_locale_h = yes; then - gt_LC_MESSAGES - fi +# 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. - if test -n "$INTL_MACOSX_LIBS"; then - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - fi +# 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. - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# 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", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# 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 + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + 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 + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # 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. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/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 - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi + # 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=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --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]) +AC_SUBST([AMDEPBACKSLASH]) ]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) - -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 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 (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -dnl From Bruno Haible. +# 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. -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) +# 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. - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //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 ' + /^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=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) +# Do all the work for Automake. -*- Autoconf -*- -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 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. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 11 + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])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]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' else - PATH_SEPARATOR=: + CYGPATH_W=echo fi - rm -f conf$$.sh fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# 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_SET_LEADING_DOT])dnl + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 1 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - AC_MSG_RESULT(no) + am__leading_dot=_ fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -# lib-link.m4 serial 5 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 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. - -dnl From Bruno Haible. - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) +# Check to see how 'make' treats includes. -*- Autoconf -*- -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) +# 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. -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) +# 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. -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) +# 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. -# lib-prefix.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 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. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi +# serial 2 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__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 | grep -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 ]) -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) +# -*- Autoconf -*- -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) -# nls.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 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. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. -AC_DEFUN([AM_MKINSTALLDIRS], -[ - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate it. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) +# 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. -# po.m4 serial 5 (gettext-0.14.2) -dnl Copyright (C) 1995-2005 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. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - AC_MSG_RESULT( - [found $GMSGFMT program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi +# 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. - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - fi +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. - AC_OUTPUT_COMMANDS([ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) +# serial 3 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[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 + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi ]) -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat < "$ac_file.tmp" - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. - -AC_PREREQ(2.50) - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' else - PATH_SEPARATOR=: + mkdir_p='$(install_sh) -d' fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) fi -AC_SUBST($1)dnl -]) +AC_SUBST([mkdir_p])]) -# AM_CONDITIONAL -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -2063,28 +778,165 @@ AC_SUBST($1)dnl # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 6 +# serial 2 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +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 conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + 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". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : else - $1_TRUE='#' - $1_FALSE= + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) +AC_MSG_RESULT(yes)]) + +# AM_PROG_INSTALL_STRIP + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU 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. -m4_include([./automake/dpkg.m4]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# 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 +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +m4_include([m4/arch.m4]) +m4_include([m4/codeset.m4]) +m4_include([m4/compiler.m4]) +m4_include([m4/funcs.m4]) +m4_include([m4/gettext.m4]) +m4_include([m4/glibc21.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/intdiv0.m4]) +m4_include([m4/intmax.m4]) +m4_include([m4/inttypes-pri.m4]) +m4_include([m4/inttypes.m4]) +m4_include([m4/inttypes_h.m4]) +m4_include([m4/lcmessage.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) +m4_include([m4/libs.m4]) +m4_include([m4/linker.m4]) +m4_include([m4/longdouble.m4]) +m4_include([m4/longlong.m4]) +m4_include([m4/nls.m4]) +m4_include([m4/perl.m4]) +m4_include([m4/po.m4]) +m4_include([m4/printf-posix.m4]) +m4_include([m4/progtest.m4]) +m4_include([m4/signed.m4]) +m4_include([m4/size_max.m4]) +m4_include([m4/stdint_h.m4]) +m4_include([m4/types.m4]) +m4_include([m4/uintmax_t.m4]) +m4_include([m4/ulonglong.m4]) +m4_include([m4/wchar_t.m4]) +m4_include([m4/wint_t.m4]) +m4_include([m4/xsize.m4]) diff --git a/archtable b/archtable index 88357032..2ad462f0 100644 --- a/archtable +++ b/archtable @@ -1,66 +1,36 @@ -# This file contains a table of known architecture strings, with -# things to map them to. +# This file contains the table of known architecture strings. # -# Column 1 contains the $target_cpu-$target_os string as determined -# by configure. -# Column 2 contains the Debian architecture string, which is -# returned by `dpkg --print-installation-architecture'. -# Column 3 is returned by `dpkg --print-architecture'. +# Column 1 is determined by dpkg's configure script based on the output +# of the config.guess script. +# Column 2 contains the Debian name for the architecture, which is returned +# by ‘dpkg --print-installation-architecture’. +# +# +i386-linux i386 +ia64-linux ia64 +alpha-linux alpha +x86_64-linux amd64 +arm-linux arm +hppa-linux hppa +m32r-linux m32r +m68k-linux m68k +mips-linux mips +mipsel-linux mipsel +powerpc-linux powerpc +s390-linux s390 +s390x-linux s390x +sh3-linux sh3 +sh3eb-linux sh3eb +sh4-linux sh4 +sh4eb-linux sh4eb +sparc-linux sparc -i386-linux-gnu i386 i486 -i486-linux-gnu i386 i486 -i586-linux-gnu i386 i486 -i686-linux-gnu i386 i486 -pentium-linux-gnu i386 i486 -sparc-linux-gnu sparc sparc -sparc64-linux-gnu sparc sparc -alpha-linux-gnu alpha alpha -alphaev4-linux-gnu alpha alpha -alphaev5-linux-gnu alpha alpha -alphaev56-linux-gnu alpha alpha -alphapca56-linux-gnu alpha alpha -alphaev6-linux-gnu alpha alpha -alphaev67-linux-gnu alpha alpha -alphaev68-linux-gnu alpha alpha -m68k-linux-gnu m68k m68k -arm-linux-gnu arm arm -armv3l-linux-gnu arm arm -armv4l-linux-gnu arm arm -ppc-linux-gnu powerpc powerpc -powerpc-linux-gnu powerpc powerpc -powerpc powerpc powerpc -mips-linux-gnu mips mips -mipsel-linux-gnu mipsel mipsel -mipseb-linux-gnu mips mips -i386-gnu hurd-i386 undefined -i386-gnu0.2 hurd-i386 undefined -i386-gnu0.3 hurd-i386 undefined -i486-gnu0.3 hurd-i386 undefined -i586-gnu0.3 hurd-i386 undefined -i686-gnu0.3 hurd-i386 undefined -ia64-linux-gnu ia64 ia64 -ia64-unknown-linux ia64 ia64 -ia64-unknown-linux-gnu ia64 ia64 -x86_64-linux-gnu amd64 x86_64 -sh3-linux-gnu sh3 sh3 -sh4-linux-gnu sh4 sh4 -sh3eb-linux-gnu sh3eb sh3eb -sh4eb-linux-gnu sh4eb sh4eb -hppa-linux-gnu hppa hppa -hppa1.1-linux-gnu hppa hppa -hppa2.0-linux-gnu hppa hppa -hppa64-linux-gnu hppa hppa -i386-freebsd freebsd-i386 freebsd-i386 -i386-kfreebsd-gnu kfreebsd-i386 kfreebsd-i386 -i386-netbsdelf-gnu netbsd-i386 netbsd-i386 -i386-knetbsd-gnu knetbsd-i386 knetbsd-i386 -s390-linux-gnu s390 s390 -s390-ibm-linux-gnu s390 s390 -s390-unknown-linux-gnu s390 s390 -i386-openbsd openbsd-i386 openbsd-i386 -i386-unknown-openbsd openbsd-i386 openbsd-i386 -powerpc-darwin darwin-powerpc darwin-powerpc -i386-darwin darwin-i386 darwin-i386 -s390x-linux-gnu s390x s390x -s390x-ibm-linux-gnu s390x s390x -s390x-unknown-linux-gnu s390x s390x +i386-darwin darwin-i386 +powerpc-darwin darwin-powerpc +i386-freebsd freebsd-i386 +i386-gnu hurd-i386 +i386-kfreebsd-gnu kfreebsd-i386 +x86_64-kfreebsd-gnu kfreebsd-amd64 +i386-knetbsd-gnu knetbsd-i386 +i386-netbsd netbsd-i386 +i386-openbsd openbsd-i386 diff --git a/automake/dpkg.m4 b/automake/dpkg.m4 deleted file mode 100644 index 52edf472..00000000 --- a/automake/dpkg.m4 +++ /dev/null @@ -1,68 +0,0 @@ -dnl DPKG_CACHED_TRY_COMPILE(,,,,,) -AC_DEFUN(DPKG_CACHED_TRY_COMPILE,[ - AC_MSG_CHECKING($1) - AC_CACHE_VAL($2,[ - AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no]) - ]) - if test "x$$2" = xyes; then - true - $5 - else - true - $6 - fi -]) - -dnl DPKG_C_GCC_ATTRIBUTE(,,,,,,[],[]) -AC_DEFUN(DPKG_C_GCC_ATTRIBUTE,[ - DPKG_CACHED_TRY_COMPILE(__attribute__(($1)),dpkg_cv_c_attribute_$2,, - [extern int testfunction($3) __attribute__(($4))], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GNUC25_$5,,$6) - $7, - AC_MSG_RESULT(no) - $8) -]) - -dnl DPKG_C_GCC_TRY_WARNS(,) -AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[ - AC_MSG_CHECKING([GCC warning flag(s) $1]) - if test "${GCC-no}" = yes - then - AC_CACHE_VAL($2,[ - if $CC $1 -c /dev/null 2>/dev/null; then - $2=yes - else - $2= - fi - ]) - if test "x$$2" = xyes; then - CWARNS="${CWARNS} $1" - AC_MSG_RESULT(ok) - else - AC_MSG_RESULT(no) - fi - else - AC_MSG_RESULT(no, not using GCC) - fi -]) -dnl DPKG_CACHED_TRY_COMPILE(,,,,,) - - -dnl Check if a #define is present in an include file -AC_DEFUN(DPKG_CHECK_DEFINE, - [AC_CACHE_CHECK(if $1 is defined in $2, - ac_cv_define_$1, - [AC_TRY_COMPILE([ -#include <$2> - ],[ -int i = $1; - ], - ac_cv_define_$1=yes, - ac_cv_define_$1=no) - ]) - if test "$ac_cv_define_$1" = yes ; then - AC_DEFINE(HAVE_$1,,[define if $1 is defined]) - fi -]) - diff --git a/automake/tl_canon.m4 b/automake/tl_canon.m4 deleted file mode 100644 index d8511e48..00000000 --- a/automake/tl_canon.m4 +++ /dev/null @@ -1,209 +0,0 @@ -# Our own versions of the other canonicalizing stuff - -dnl replace AC_CANONICAL_xxx - -undefine([AC_CANONICAL_HOST]) -define([AC_CANONICAL_HOST], [tl_CANONICAL_HOST]) -undefine([AC_CANONICAL_BUILD]) -define([AC_CANONICAL_BUILD], [tl_CANONICAL_BUILD]) -undefine([AC_CANONICAL_TARGET]) -define([AC_CANONICAL_TARGET], [tl_CANONICAL_TARGET]) -undefine([AC_CANONICAL_SYSTEM]) -define([AC_CANONICAL_SYSTEM], [tl_CANONICAL_SYSTEM]) - -dnl Canonicalize the host, target, and build system types. -AC_DEFUN(tl_CANONICAL_SYSTEM, -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_PROVIDE([AC_CANONICAL_SYSTEM])dnl -AC_BEFORE([$0], [AC_ARG_PROGRAM]) -# 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. - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) AC_MSG_ERROR(can only configure for one host and one target at a time) ;; -esac - -tl_CANONICAL_HOST -tl_CANONICAL_TARGET -tl_CANONICAL_BUILD -test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- -AC_CHECK_TOOL_PREFIX -]) - -dnl Subroutines of tl_CANONICAL_SYSTEM. - -AC_DEFUN(tl_CANONICAL_HOST, -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_PROVIDE([AC_CANONICAL_HOST])dnl - -# Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : -else AC_MSG_ERROR(can not run $ac_config_sub) -fi - -AC_MSG_CHECKING(host system type) - -dnl Set host_alias. - -if test "${GCC-no}" = "yes"; then -changequote(, )dnl - libgcc="`${CC} --print-libgcc-file-name`" - host_alias="`echo ${libgcc} | - sed -e 's,^.*/gcc-lib/,,; s,/libgcc\.a$,,; s,/egcs-,/,; s,/[0-9.][0-9.]*$,,'`" - case ${host_alias} in - *-linux{,elf,aout}) - host_alias="`echo ${host_alias} | sed 's/\([^-]*\)-linux.*/\1/'`" -changequote([, ])dnl - if ar p "${libgcc}" __main.o 2>/dev/null | file - 2>/dev/null | grep ELF >/dev/null; then - host_alias="${host_alias}-linux" - else - host_alias="${host_alias}-linuxaout" - fi ;; - esac -else - host_alias=$host - case "$host_alias" in - NONE) - case "$nonopt" in - NONE) - if host_alias=`$ac_config_guess`; then host_guessed=y - else AC_MSG_ERROR(can not guess host type; you must specify one) - fi ;; - *) host_alias=$nonopt ;; - esac ;; - esac -fi - -dnl Set the other host vars. -changequote(<<, >>)dnl -host=`$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/'` -changequote([, ])dnl -AC_MSG_RESULT($host) -AC_SUBST(host)dnl -AC_SUBST(host_alias)dnl -AC_SUBST(host_cpu)dnl -AC_SUBST(host_vendor)dnl -AC_SUBST(host_os)dnl -]) - -dnl Internal use only. -AC_DEFUN(tl_CANONICAL_TARGET, -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_PROVIDE([AC_CANONICAL_TARGET])dnl -AC_MSG_CHECKING(target system type) - -dnl Set target_alias. -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) - target_cpu="`dpkg --print-architecture`" - if test "$target_cpu" = ""; then - target_alias=$host_alias - else - target_alias="`echo ${host_alias} | sed 's/[^-]*-/${target_cpu}-/'`" - fi - ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -dnl Set the other target vars. -if test $target_alias = $host_alias; then - target=$host - target_cpu=$host_cpu - target_vendor=$host_vendor - target_os=$host_os -elif test $target_alias = "$build_alias"; then - target=$build - target_cpu=$build_cpu - target_vendor=$build_vendor - target_os=$build_os -else -changequote(<<, >>)dnl - target=`$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/'` -changequote([, ])dnl -fi -AC_MSG_RESULT($target) -AC_SUBST(target)dnl -AC_SUBST(target_alias)dnl -AC_SUBST(target_cpu)dnl -AC_SUBST(target_vendor)dnl -AC_SUBST(target_os)dnl -]) - -AC_DEFUN(tl_CANONICAL_BUILD, -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_PROVIDE([AC_CANONICAL_BUILD])dnl - -# Make sure we can run config.sub. -#if $ac_config_sub sun4 >/dev/null 2>&1; then : -#else AC_MSG_ERROR(can not run $ac_config_sub) -#fi - -AC_MSG_CHECKING(build system type) - -dnl Set build_alias. -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) - if test "$host_guessed" = "y"; then - build_alias=$host_alias - else - if build_alias=`$ac_config_guess`; then : - else build_alias=$host_alias - fi - fi ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -dnl Set the other build vars. -if test $build_alias = $host_alias; then - build=$host - build_cpu=$host_cpu - build_vendor=$host_vendor - build_os=$host_os -else -changequote(<<, >>)dnl - build=`$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/'` -changequote([, ])dnl -fi -AC_MSG_RESULT($build) -AC_SUBST(build)dnl -AC_SUBST(build_alias)dnl -AC_SUBST(build_cpu)dnl -AC_SUBST(build_vendor)dnl -AC_SUBST(build_os)dnl -]) diff --git a/automake/tools.m4 b/automake/tools.m4 deleted file mode 100644 index 66995d60..00000000 --- a/automake/tools.m4 +++ /dev/null @@ -1,233 +0,0 @@ -# tl_CHECK_TOOL_PREFIX will work _BEFORE_ AC_CANONICAL_HOST, etc., has been -# called. It should be called again after these have been called. -# -# Basically we want to check if the host alias specified by the user is -# different from the build alias. The rules work like this:- -# -# If host is not specified, it defaults to NONOPT -# If build is not specified, it defaults to NONOPT -# If nonopt is not specified, we guess all other values - -dnl Replace AC_CHECK_TOOL_PREFIX -undefine([AC_CHECK_TOOL_PREFIX]) -define([AC_CHECK_TOOL_PREFIX], [tl_CHECK_TOOL_PREFIX]) - -AC_DEFUN(tl_CHECK_TOOL_PREFIX, -[AC_PROVIDE([AC_CHECK_TOOL_PREFIX]) -AC_BEFORE([AC_CANONICAL_HOST]) -AC_BEFORE([AC_CANONICAL_BUILD]) -dnl Quick check -if test "$host_alias" = ""; then - if test $host = NONE && test $build != NONE; then - thost=$nonopt - else - thost=$host - fi - - if test $thost != $build && test $thost != NONE; then - ac_tool_prefix=${thost}- - ac_tool_dir=${thost} - else - ac_tool_prefix= - ac_tool_dir= - fi -else - if test $host != $build; then - ac_tool_prefix=${host_alias}- - ac_tool_dir=${host_alias} - else - ac_tool_prefix= - ac_tool_dir= - fi -fi -]) - -dnl replacement for AC_CHECK_TOOL -undefine([AC_CHECK_TOOL]) -define([AC_CHECK_TOOL], [tl_CHECK_TOOL($1, $2, $3, $4)]) - -dnl tl_CHECK_TOOL - AC_CHECK_TOOL, with a couple of extra checks -dnl tl_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH -dnl [, REJECT]]) -AC_DEFUN(tl_CHECK_TOOL, -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) -AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, - ifelse([$3], , [$2], ), $4, $5) -if test "$ac_tool_dir" != ""; then - if test -z "$ac_cv_prog_$1" && test "$5" != "/usr/${ac_tool_dir}/bin/$2" && - test "$5" != "/usr/local/${ac_tool_dir}/bin/$2"; then - if test -f /usr/${ac_tool_dir}/bin/$2; then $1="/usr/${ac_tool_dir}/bin/$2" - elif test -f /usr/local/${ac_tool_dir}/bin/$2; then $1="/usr/local/${ac_tool_dir}/bin/$2" - fi - fi -fi -ifelse([$3], , , [ -if test -z "$ac_cv_prog_$1"; then -if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG($1, $2, $2, $3, $4, $5) -else - $1="$3" -fi -fi]) -]) - -dnl tl_CHECK_TOOLS - -dnl do a tl_CHECK_TOOL for multiple tools (like AC_CHECK_PROGS) -dnl tl_CHECK_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND -dnl [, PATH]]) -AC_DEFUN(tl_CHECK_TOOLS, -[for ac_tool in $2 -do -tl_CHECK_TOOL($1, [$]ac_tool, [$]ac_tool, , $4) -test -n "[$]$1" && break -done -ifelse([$3], , , [test -n "[$]$1" || $1="$3" -])]) - -dnl replace AC_PROG_CC and AC_PROG_CXX -undefine([AC_PROG_CC]) -define([AC_PROG_CC], [tl_PROG_CC]) -undefine([AC_PROG_CXX]) -define([AC_PROG_CXX], [tl_PROG_CXX]) - -dnl tl_PROG_CC, tl_PROG_CXX - same as old AC_PROG_CC and AC_PROG_CXX, but -dnl use AC_CHECK_TOOL/tl_CHECK_TOOLS instead of AC_CHECK_PROG, etc. -AC_DEFUN(tl_PROG_CC, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -AC_PROVIDE([AC_PROG_CC])dnl -tl_CHECK_TOOL(CC, gcc, gcc) -if test -z "$CC"; then - AC_CHECK_TOOL(CC, cc, cc, , , /usr/ucb/cc) - test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -fi -if test -n "$ac_tool_prefix" && - test "`echo $CC | grep '$ac_tool_prefix'`" = "" && - test "`echo $CC | grep -- '-b'`" = ""; then - if $CC -v 2>&1 | grep -q gcc; then - AC_CACHE_CHECK([if $CC -b${ac_tool_dir} works], tl_cv_prog_cc_bhost,[ - old_cc="${CC}" - CC="${CC} -b${ac_tool_dir}" - AC_LANG_SAVE - AC_LANG_C - AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cc_bhost, ac_cv_prog_cc_cross) - AC_LANG_RESTORE]) - if test $tl_cv_prog_cc_bhost = "yes"; then - ac_cv_prog_cc_works=yes - cctest=yes - else - CC="${old_cc}" - fi - fi -fi - -if test "$cctest" != "yes"; then - tl_PROG_CC_WORKS -fi -AC_PROG_CC_GNU - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -dnl Check whether -g works, even if CFLAGS is set, in case the package -dnl plays around with CFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - AC_PROG_CC_G - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi -]) - -AC_DEFUN(tl_PROG_CXX, -[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl -AC_PROVIDE([AC_PROG_CXX])dnl -tl_CHECK_TOOLS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) -if test -n "$CXX"; then - if test -n "$ac_tool_prefix" && - test "`echo $CXX | grep '$ac_tool_prefix'`" = "" && - test "`echo $CXX | grep -- '-b'`" = ""; then - if $CXX -v 2>&1 | grep -q gcc; then - AC_CACHE_CHECK([if $CXX -b${ac_tool_dir} works], tl_cv_prog_cxx_bhost,[ - old_cxx="${CXX}" - CXX="${CXX} -b${ac_tool_dir}" - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILER([main(){return(0);}], tl_cv_prog_cxx_bhost, ac_cv_prog_cxx_cross) - AC_LANG_RESTORE]) - if test $tl_cv_prog_cxx_bhost = "yes"; then - ac_cv_prog_cxx_works=yes - cxxtest=yes - else - CXX="${old_cxx}" - fi - fi - fi - - if test "$cxxtest" != "yes"; then - tl_PROG_CXX_WORKS - fi - AC_PROG_CXX_GNU - - if test $ac_cv_prog_gxx = yes; then - GXX=yes -dnl Check whether -g works, even if CXXFLAGS is set, in case the package -dnl plays around with CXXFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - AC_PROG_CXX_G - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_cxx_g = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-O2" - fi - else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" - fi -fi -]) - -AC_DEFUN(tl_PROG_CC_WORKS, -[AC_PROVIDE(AC_PROG_CC_WORKS) -AC_CACHE_CHECK([whether the C compiler ($CC $CFLAGS $LDFLAGS) works], - ac_cv_prog_cc_works, [ -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross) -AC_LANG_RESTORE -if test $ac_cv_prog_cc_works = no; then - AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.]) -fi]) -AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler]) -AC_MSG_RESULT($ac_cv_prog_cc_cross) -cross_compiling=$ac_cv_prog_cc_cross -]) - -AC_DEFUN(tl_PROG_CXX_WORKS, -[AC_PROVIDE(AC_PROG_CXX_WORKS) -AC_CACHE_CHECK([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works], - ac_cv_prog_cxx_works, [ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) -AC_LANG_RESTORE -if test $ac_cv_prog_cxx_works = no; then - AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.]) -fi]) -AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler]) -AC_MSG_RESULT($ac_cv_prog_cxx_cross) -cross_compiling=$ac_cv_prog_cxx_cross -]) diff --git a/config.guess b/config.guess index 82294713..51fab477 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2004-03-12' # 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 @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +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 @@ -203,15 +203,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; cats:OpenBSD:*:*) echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -227,12 +227,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + pegasos:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} + echo mipseb-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -298,6 +307,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -319,9 +331,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -345,7 +354,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -755,7 +764,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -778,7 +787,21 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -827,12 +850,6 @@ EOF cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit 0 ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1079,9 +1096,9 @@ EOF M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[5678]*:*) + M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1179,10 +1196,9 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in + case `uname -p` in *86) UNAME_PROCESSOR=i686 ;; - unknown) UNAME_PROCESSOR=powerpc ;; + powerpc) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1244,16 +1260,6 @@ EOF *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.h.in b/config.h.in index 083c0626..6f74f0c0 100644 --- a/config.h.in +++ b/config.h.in @@ -1,80 +1,174 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Set this to the canonical Debian architecture string for this CPU type. */ #undef ARCHITECTURE +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + /* Define to 1 if you have the `alphasort' function. */ #undef HAVE_ALPHASORT -/* Define if alphasort is declared. */ -#undef HAVE_ALPHASORT_DECLARATION +/* Define to 1 if you have the header file. */ +#undef HAVE_ARGZ_H + +/* Define to 1 if you have the `asprintf' function. */ +#undef HAVE_ASPRINTF + +/* Define to 1 if you have the `bcopy' function. */ +#undef HAVE_BCOPY -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT +/* Define to 1 if the compiler supports C99. */ +#undef HAVE_C99 -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE +/* Define to 1 if compiler supports `__attribute__', 0 otherwise. */ +#undef HAVE_C_ATTRIBUTE /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_FEOF_UNLOCKED + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#undef HAVE_DECL_FGETS_UNLOCKED + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#undef HAVE_DECL_GETC_UNLOCKED + /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */ #undef HAVE_DECL_SYS_SIGLIST -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNPRINTF + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ +#undef HAVE_DECL__SNWPRINTF /* Define to 1 if you have the header file. */ #undef HAVE_ERROR_H -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT +/* Define to 1 if you have the `fwprintf' function. */ +#undef HAVE_FWPRINTF + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD -/* Define if function attributes a la GCC 2.5 and higher are available. */ -#undef HAVE_GNUC25_ATTRIB +/* Define to 1 if you have the `getegid' function. */ +#undef HAVE_GETEGID -/* Define if constant functions a la GCC 2.5 and higher are available. */ -#undef HAVE_GNUC25_CONST +/* Define to 1 if you have the `geteuid' function. */ +#undef HAVE_GETEUID -/* Define if nonreturning functions a la GCC 2.5 and higher are available. */ -#undef HAVE_GNUC25_NORETURN +/* Define to 1 if you have the `getgid' function. */ +#undef HAVE_GETGID -/* Define if printf-format argument lists a la GCC are available. */ -#undef HAVE_GNUC25_PRINTFFORMAT +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT -/* Define if unused variables la GCC 2.5 and higher are available. */ -#undef HAVE_GNUC25_UNUSED +/* Define to 1 if you have the `getuid' function. */ +#undef HAVE_GETUID /* Define if you have the iconv() function. */ #undef HAVE_ICONV -/* Define if inline functions a la GCC are available. */ -#undef HAVE_INLINE +/* Define if you have the 'intmax_t' type in or . */ +#undef HAVE_INTMAX_T -/* Define to 1 if you have the header file. */ +/* Define if exists and doesn't clash with . */ #undef HAVE_INTTYPES_H +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ +#undef HAVE_INTTYPES_H_WITH_UINTMAX + +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII + +/* Define to 1 if you have the header file. */ +#undef HAVE_KVM_H + +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET + /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H +/* Define if you have the 'long double' type. */ +#undef HAVE_LONG_DOUBLE + +/* Define if you have the 'long long' type. */ +#undef HAVE_LONG_LONG + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `memcpy' function. */ +#undef HAVE_MEMCPY + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `mempcpy' function. */ +#undef HAVE_MEMPCPY + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `munmap' function. */ +#undef HAVE_MUNMAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_NL_TYPES_H + +/* Define if your printf() function supports format strings with positions. */ +#undef HAVE_POSIX_PRINTF + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + /* Define to 1 if you have the `scandir' function. */ #undef HAVE_SCANDIR -/* Define if setlocale is available. */ +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE /* Define to 1 if you have the `setsid' function. */ @@ -89,9 +183,22 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define if exists, doesn't clash with , and declares + uintmax_t. */ +#undef HAVE_STDINT_H_WITH_UINTMAX + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `stpcpy' function. */ +#undef HAVE_STPCPY + +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR @@ -107,41 +214,69 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_CDEFS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* define if TIOCNOTTY is defined */ +/* Define to 1 if you have the macro `TIOCNOTTY' in `sys/ioctl.h', and to 0 if + you don't. */ #undef HAVE_TIOCNOTTY +/* Define to 1 if you have the `tsearch' function. */ +#undef HAVE_TSEARCH + +/* Define if you have the 'uintmax_t' type in or . */ +#undef HAVE_UINTMAX_T + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV -/* Whether the va_copy macro exists */ -#undef HAVE_VA_COPY +/* Define if you have the 'unsigned long long' type. */ +#undef HAVE_UNSIGNED_LONG_LONG -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF +/* Define to 1 if the `va_copy' macro exists */ +#undef HAVE_VA_COPY /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Defined to the $(libdir) location */ -#undef LLIBDIR +/* Define if you have the 'wchar_t' type. */ +#undef HAVE_WCHAR_T + +/* Define to 1 if you have the `wcslen' function. */ +#undef HAVE_WCSLEN + +/* Define if you have the 'wint_t' type. */ +#undef HAVE_WINT_T -/* Defined to $(localstatedir) dir location */ -#undef LOCALSTATEDIR +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT + +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT + +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define to 1 if you have the `__fsetlocking' function. */ +#undef HAVE___FSETLOCKING + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST + +/* Define if integer division by zero raises signal SIGFPE. */ +#undef INTDIV0_RAISES_SIGFPE /* Name of package */ #undef PACKAGE @@ -161,21 +296,36 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Define if exists and defines unusable PRI* macros. */ +#undef PRI_MACROS_BROKEN + /* 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 +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#undef SIZE_MAX + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if start-stop-daemon is compiled. */ -#undef USE_START_STOP_DAEMON - /* Version number of package */ #undef VERSION +/* Define to 1 if start-stop-daemon is compiled. */ +#undef WITH_START_STOP_DAEMON + /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN @@ -183,6 +333,11 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif + /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -198,176 +353,25 @@ /* Define to `int' if does not define. */ #undef mode_t +/* Define to `long' if does not define. */ +#undef off_t + /* Define to `int' if does not define. */ #undef pid_t -/* Define to `int' if does not define. */ +/* Define to `int' if does not define. */ #undef ptrdiff_t +/* Define to empty if the C compiler doesn't support this keyword. */ +#undef signed + /* Define to `unsigned' if does not define. */ #undef size_t -#ifdef HAVE_SYS_CDEFS_H -#include -#endif - -#ifdef HAVE_STDDEF_H -#include -#endif - -/* Use the definitions: */ - -/* Give us an unsigned 32-bit data type. */ -#if SIZEOF_UNSIGNED_LONG==4 -#define UWORD32 unsigned long -#elif SIZEOF_UNSIGNED_INT==4 -#define UWORD32 unsigned int -#else -#error I do not know what to use for a UWORD32. -#endif - -/* The maximum length of a #! interpreter displayed by dpkg-deb. */ -#ifdef PATH_MAX -#define INTERPRETER_MAX PATH_MAX -#else -#define INTERPRETER_MAX 1024 -#endif - -/* GNU C attributes. */ -#ifndef FUNCATTR -#ifdef HAVE_GNUC25_ATTRIB -#define FUNCATTR(x) __attribute__(x) -#else -#define FUNCATTR(x) -#endif -#endif - -/* GNU C printf formats, or null. */ -#ifndef ATTRPRINTF -#ifdef HAVE_GNUC25_PRINTFFORMAT -#define ATTRPRINTF(si,tc) format(printf,si,tc) -#else -#define ATTRPRINTF(si,tc) -#endif -#endif -#ifndef PRINTFFORMAT -#define PRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc))) -#endif - -/* GNU C nonreturning functions, or null. */ -#ifndef ATTRNORETURN -#ifdef HAVE_GNUC25_NORETURN -#define ATTRNORETURN noreturn -#else /* ! HAVE_GNUC25_NORETURN */ -#define ATTRNORETURN -#endif /* HAVE_GNUC25_NORETURN */ -#endif /* ATTRNORETURN */ - -#ifndef NONRETURNING -#define NONRETURNING FUNCATTR((ATTRNORETURN)) -#endif /* NONRETURNING */ - -/* Combination of both the above. */ -#ifndef NONRETURNPRINTFFORMAT -#define NONRETURNPRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc),ATTRNORETURN)) -#endif - -/* GNU C constant functions, or null. */ -#ifndef ATTRCONST -#ifdef HAVE_GNUC25_CONST -#define ATTRCONST const -#else -#define ATTRCONST -#endif -#endif -#ifndef CONSTANT -#define CONSTANT FUNCATTR((ATTRCONST)) -#endif - -/* GNU C unused functions, or null. */ -#ifndef ATTRUNUSED -#ifdef HAVE_GNUC25_UNUSED -#define ATTRUNUSED -#else -#define ATTRUNUSED -#endif -#endif -#ifndef UNUSED -#define UNUSED FUNCATTR((ATTRUNUSED)) -#endif - -/* Declare strerror if we don't have it already. */ -#ifndef HAVE_STRERROR -const char *strerror(int); -#endif - -/* Declare strsignal if we don't have it already. */ -#ifndef HAVE_STRSIGNAL -const char *strsignal(int); -#endif - -/* Declare scandir if we don't have it already. */ -#ifndef HAVE_SCANDIR -struct dirent; -int scandir(const char *dir, struct dirent ***namelist, - int (*select)(const struct dirent *), - int (*compar)(const void*, const void*)); -#endif - -/* Declare alphasort if we don't have it already. */ -#if !defined(HAVE_ALPHASORT) || !defined(HAVE_ALPHASORT_DECLARATION) -struct dirent; -int alphasort(const struct dirent *a, const struct dirent *b); -#endif - -/* Declare unsetenv if we don't have it already. */ -#ifndef HAVE_UNSETENV -void unsetenv(const char *x); -#endif - -/* Define strtoul if we don't have it already. */ -#ifndef HAVE_STRTOUL -#define strtoul strtol -#endif - -#ifndef HAVE_VA_COPY -#define va_copy(dest,src) (dest) = (src) -#endif - -/* Define WCOREDUMP if we don't have it already - coredumps won't be - * detected, though. - */ -#ifndef WCOREDUMP -#define WCOREDUMP(x) 0 -#endif - -/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default. - */ -#ifndef BUILDOLDPKGFORMAT -#define BUILDOLDPKGFORMAT 0 -#endif - -/* Take care of NLS matters. */ - -#if HAVE_LOCALE_H -# include -#endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) /* empty */ -#endif - -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -# define N_(Text) Text -#else -# undef bindtextdomain -# define bindtextdomain(Domain, Directory) /* empty */ -# undef textdomain -# define textdomain(Domain) /* empty */ -# define _(Text) Text -# define N_(Text) Text -# define gettext(Text) Text -#endif - +/* Define to unsigned long or unsigned long long if and + don't define. */ +#undef uintmax_t +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +#undef volatile diff --git a/config.rpath b/config.rpath index 3f1bef34..4db13e50 100755 --- a/config.rpath +++ b/config.rpath @@ -2,13 +2,28 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2005 Free Software Foundation, Inc. +# Copyright 1996-2003 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # -# 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. +# 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. # # The first argument passed to this file is the canonical host specification, # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM @@ -35,8 +50,6 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -cc_basename=`echo "$CC" | sed -e 's%^.*/%%'` - # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. wl= @@ -47,13 +60,6 @@ else aix*) wl='-Wl,' ;; - darwin*) - case "$cc_basename" in - xlc*) - wl='-Wl,' - ;; - esac - ;; mingw* | pw32* | os2*) ;; hpux9* | hpux10* | hpux11*) @@ -65,19 +71,13 @@ else newsos6) ;; linux*) - case $cc_basename in - icc* | ecc*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) + case $CC in + icc|ecc) wl='-Wl,' ;; - ccc*) + ccc) wl='-Wl,' ;; - como) - wl='-lopt=' - ;; esac ;; osf3* | osf4* | osf5*) @@ -96,9 +96,6 @@ else ;; sysv4*MP*) ;; - unicos*) - wl='-Wl,' - ;; uts4*) ;; esac @@ -141,7 +138,7 @@ if test "$with_gnu_ld" = yes; then # that the semantics of dynamic libraries on AmigaOS, at least up # to version 4, is to share data among multiple programs linked # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use + # behavior of shared libraries on other platforms, we can use # them. ld_shlibs=no ;; @@ -176,13 +173,6 @@ if test "$with_gnu_ld" = yes; then sunos4*) hardcode_direct=yes ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : @@ -276,7 +266,7 @@ else # see comment about different semantics on the GNU ld section ld_shlibs=no ;; - bsdi[45]*) + bsdi4*) ;; cygwin* | mingw* | pw32*) # When not using gcc, we currently assume that we are using @@ -287,17 +277,8 @@ else libext=lib ;; darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case "$cc_basename" in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + hardcode_direct=no fi ;; dgux*) @@ -314,7 +295,7 @@ else hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -457,7 +438,7 @@ case "$host_os" in ;; beos*) ;; - bsdi[45]*) + bsdi4*) ;; cygwin* | mingw* | pw32*) shrext=.dll @@ -469,8 +450,6 @@ case "$host_os" in ;; freebsd1*) ;; - kfreebsd*-gnu) - ;; freebsd*) ;; gnu*) @@ -507,13 +486,11 @@ case "$host_os" in ;; linux*) ;; - knetbsd*-gnu) - ;; netbsd*) ;; newsos6) ;; - nto-qnx*) + nto-qnx) ;; openbsd*) ;; @@ -542,7 +519,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` shlibext=`echo "$shrext" | sed -e 's,^\.,,'` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +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 @@ -145,7 +145,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis) os= basic_machine=$1 ;; @@ -267,7 +267,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -300,7 +300,7 @@ case $basic_machine in | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -326,9 +326,8 @@ case $basic_machine in | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ - | mmix-* \ | msp430-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -343,8 +342,8 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -446,10 +445,6 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; cr16c) basic_machine=cr16c-unknown os=-elf @@ -457,9 +452,6 @@ case $basic_machine in crds | unos) basic_machine=m68k-crds ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -489,10 +481,6 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -671,6 +659,10 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -751,6 +743,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -1033,10 +1029,6 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1067,9 +1059,6 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; - mmix) - basic_machine=mmix-knuth - ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1305,9 +1294,6 @@ case $os in -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) @@ -1388,9 +1374,6 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) - os=-mmixware - ;; *-wec) os=-proelf ;; diff --git a/configure b/configure index c6f0d1ba..d104a618 100755 --- a/configure +++ b/configure @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59 for dpkg 1.13.1. +# +# Report bugs to . # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -265,14 +267,13 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="include/dpkg.h.in" -ac_default_prefix=/usr +PACKAGE_NAME='dpkg' +PACKAGE_TARNAME='dpkg' +PACKAGE_VERSION='1.13.1' +PACKAGE_STRING='dpkg 1.13.1' +PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' + +ac_unique_file="lib/dpkg.h" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -310,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALSO_STATIC DSELECTDIR USE_START_STOP_DAEMON USE_SGML_DOC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX HAVE_CPLUSPLUS_TRUE HAVE_CPLUSPLUS_FALSE LD ac_ct_LD PACKAGE VERSION SET_MAKE os_type INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP EGREP RANLIB ac_ct_RANLIB LN_S RM SED PERL SSD_LIBS CURSES_LIBS ZLIB_CFLAGS ZLIB_LIBS ZLIB_LIBS_ALSO_STATIC BZ2LIB_CFLAGS BZ2LIB_LIBS BZ2LIB_LIBS_ALSO_STATIC CWARNS admindir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB WITH_DSELECT_TRUE WITH_DSELECT_FALSE WITH_START_STOP_DAEMON_TRUE WITH_START_STOP_DAEMON_FALSE admindir CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE PERL ZLIB_CFLAGS ZLIB_LIBS BZ2_CFLAGS BZ2_LIBS CURSES_LIBS SSD_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -767,6 +768,10 @@ 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 ac_env_CXX_set=${CXX+set} ac_env_CXX_value=$CXX ac_cv_env_CXX_set=${CXX+set} @@ -775,10 +780,34 @@ ac_env_CXXFLAGS_set=${CXXFLAGS+set} ac_env_CXXFLAGS_value=$CXXFLAGS ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP +ac_env_PERL_set=${PERL+set} +ac_env_PERL_value=$PERL +ac_cv_env_PERL_set=${PERL+set} +ac_cv_env_PERL_value=$PERL +ac_env_ZLIB_CFLAGS_set=${ZLIB_CFLAGS+set} +ac_env_ZLIB_CFLAGS_value=$ZLIB_CFLAGS +ac_cv_env_ZLIB_CFLAGS_set=${ZLIB_CFLAGS+set} +ac_cv_env_ZLIB_CFLAGS_value=$ZLIB_CFLAGS +ac_env_ZLIB_LIBS_set=${ZLIB_LIBS+set} +ac_env_ZLIB_LIBS_value=$ZLIB_LIBS +ac_cv_env_ZLIB_LIBS_set=${ZLIB_LIBS+set} +ac_cv_env_ZLIB_LIBS_value=$ZLIB_LIBS +ac_env_BZ2_CFLAGS_set=${BZ2_CFLAGS+set} +ac_env_BZ2_CFLAGS_value=$BZ2_CFLAGS +ac_cv_env_BZ2_CFLAGS_set=${BZ2_CFLAGS+set} +ac_cv_env_BZ2_CFLAGS_value=$BZ2_CFLAGS +ac_env_BZ2_LIBS_set=${BZ2_LIBS+set} +ac_env_BZ2_LIBS_value=$BZ2_LIBS +ac_cv_env_BZ2_LIBS_set=${BZ2_LIBS+set} +ac_cv_env_BZ2_LIBS_value=$BZ2_LIBS +ac_env_CURSES_LIBS_set=${CURSES_LIBS+set} +ac_env_CURSES_LIBS_value=$CURSES_LIBS +ac_cv_env_CURSES_LIBS_set=${CURSES_LIBS+set} +ac_cv_env_CURSES_LIBS_value=$CURSES_LIBS +ac_env_SSD_LIBS_set=${SSD_LIBS+set} +ac_env_SSD_LIBS_value=$SSD_LIBS +ac_cv_env_SSD_LIBS_set=${SSD_LIBS+set} +ac_cv_env_SSD_LIBS_value=$SSD_LIBS # # Report the --help message. @@ -787,7 +816,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures dpkg 1.13.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -853,33 +882,43 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of dpkg 1.13.1:";; + esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-largefile omit support for large files --disable-nls do not use Native Language Support + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --disable-rpath do not hardcode runtime library paths + --disable-largefile omit support for large files + --enable-compiler-warnings + Enable additional compiler warnings + --disable-compiler-optimisations + Disable compiler optimisations + --disable-linker-optimisations + Disable linker optimisations Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-static-progs compile static versions of certain binaries as well - --with-dselect the dselect package-management frontend - --with-start-stop-daemon - start and stop system daemons - --with-sgml-doc SGML documentation converted to HTML - --with-admindir=DIR store dpkg database in DIR LIBDIR/db --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-included-gettext use the GNU gettext library included here --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-zlib use zlib for decompression of some gzip files - --with-bz2lib use bz2lib for decompression of some bzip2 files - --with-Werror use -Werror when compiling + --without-dselect don't build dselect package-management frontend + --without-start-stop-daemon + don't build or use start-stop-daemon + --with-admindir=DIR dpkg database directory [LOCALSTATEDIR/dpkg] + --with-zlib use zlib for compression and decompression + (yes/static) + --with-bz2 use bz2 library for compression and decompression + (yes/static) Some influential environment variables: CC C compiler command @@ -888,13 +927,21 @@ Some influential environment variables: nonstandard directory CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - CPP C preprocessor + PERL Perl interpreter + ZLIB_CFLAGS compiler flags for zlib library + ZLIB_LIBS linker flags for zlib library + BZ2_CFLAGS compiler flags for bz2 library + BZ2_LIBS linker flags for bz2 library + CURSES_LIBS linker flags for curses library + SSD_LIBS linker flags for start-stop-daemon Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -990,6 +1037,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +dpkg configure 1.13.1 +generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1002,7 +1051,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by dpkg $as_me 1.13.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1330,85 +1379,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers config.h" - - -ALSO_STATIC= - -# Check whether --with-static-progs or --without-static-progs was given. -if test "${with_static_progs+set}" = set; then - withval="$with_static_progs" - case "$withval" in - "true" | "yes" ) - ALSO_STATIC=1 - ;; - esac -fi; - - -DSELECTDIR="dselect" - -# Check whether --with-dselect or --without-dselect was given. -if test "${with_dselect+set}" = set; then - withval="$with_dselect" - case "$withval" in - "false" | "no" ) - DSELECTDIR="" - ;; - esac -fi; - -USE_START_STOP_DAEMON="true" - -# Check whether --with-start-stop-daemon or --without-start-stop-daemon was given. -if test "${with_start_stop_daemon+set}" = set; then - withval="$with_start_stop_daemon" - case "$withval" in - "false" | "no" ) - USE_START_STOP_DAEMON="" - ;; - esac -fi; -if test "$USE_START_STOP_DAEMON" != ""; then -cat >>confdefs.h <<\_ACEOF -#define USE_START_STOP_DAEMON -_ACEOF -fi -USE_SGML_DOC="true" -# Check whether --with-sgml-doc or --without-sgml-doc was given. -if test "${with_sgml_doc+set}" = set; then - withval="$with_sgml_doc" - case "$withval" in - "false" | "no" ) - USE_SGML_DOC="" - ;; - esac -fi; -admindir="$libdir/db" -# Check whether --with-admindir or --without-admindir was given. -if test "${with_admindir+set}" = set; then - withval="$with_admindir" - case "$withval" in - "" ) - { { echo "$as_me:$LINENO: error: invalid admindir specified" >&5 -echo "$as_me: error: invalid admindir specified" >&2;} +case m4 in + [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;; + *) ac_macro_dir=$srcdir/m4 ;; +esac +if test -d "$ac_macro_dir"; then : +else + { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5 +echo "$as_me: error: cannot find macro directory \`m4'" >&2;} { (exit 1); exit 1; }; } - ;; - * ) - admindir="$withval" - ;; - esac -fi; - +fi ac_aux_dir= @@ -1519,16 +1508,199 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -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 +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + + +am__api_version="1.8" +# 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: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done + ;; +esac +done + + +fi + if test "${ac_cv_path_install+set}" = set; then + 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 + fi +fi +echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +# Just in case +sleep 1 +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 conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + 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 "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } +fi +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +test "$program_prefix" != NONE && + 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" +# 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=`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= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # Keeping the `.' argument allows $(mkdir_p) to be used without + # argument. Indeed, we sometimes output rules like + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. + # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more + # expensive solution, as it forces Make to start a sub-shell.) + mkdir_p='mkdir -p -- .' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +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:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_AWK+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. + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1537,7 +1709,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" + ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -1546,27 +1718,124 @@ done fi fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$AWK" && break +done + +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\_ACEOF +all: + @echo 'ac_maketemp="$(MAKE)"' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftest.make +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + SET_MAKE= else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" fi +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ 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 +rmdir .tst 2>/dev/null + +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='dpkg' + VERSION='1.13.1' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +install_sh=${install_sh-"$am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_STRIP+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. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1575,7 +1844,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" + ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -1584,35 +1853,27 @@ done fi fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_STRIP+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. + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -1621,190 +1882,442 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" + ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_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. + STRIP=$ac_ct_STRIP else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - + STRIP="$ac_cv_prog_STRIP" fi + fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. + + + + + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi - CC=$ac_ct_CC +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - CC="$ac_cv_prog_CC" + ac_executable_p="test -f" fi +rm -f conf$$.file -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 +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -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 + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 +GMSGFMT=$ac_cv_path_GMSGFMT + +if test -n "$GMSGFMT"; then + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" fi -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 +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_path_XGETTEXT+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_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + rm -f messages.po + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGMERGE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac +fi +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + echo "$as_me:$LINENO: result: $MSGMERGE" >&5 +echo "${ECHO_T}$MSGMERGE" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 + GMSGFMT=":" + fi + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 + XGETTEXT=":" + fi + rm -f messages.po + fi + + ac_config_commands="$ac_config_commands default-1" + + +DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +am__include="#" +am__quote= +_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 | grep -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:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6 +rm -f confinc confmf + +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + +fi; +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + + +if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -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 $# != 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 - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi fi fi CC=$ac_cv_prog_CC @@ -1817,12 +2330,52 @@ 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:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - 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 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then @@ -1838,7 +2391,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -1856,15 +2409,11 @@ else echo "${ECHO_T}no" >&6 fi - test -n "$CC" && break - done fi -if test -z "$CC"; then +if test -z "$ac_cv_prog_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 + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then @@ -1880,7 +2429,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" + ac_cv_prog_ac_ct_CC="cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -1898,26 +2447,167 @@ else echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CC" && break -done - CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" fi fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 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 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_CC" && break +done + + CC=$ac_ct_CC +fi + +fi + + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -2522,23 +3212,125 @@ 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_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +depcc="$CC" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +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 + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + 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 + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # 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. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/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=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2547,7 +3339,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2556,31 +3348,27 @@ done fi fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break - done fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2589,520 +3377,421 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" + ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - - CXX=$ac_ct_CXX + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" fi -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 +if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +ac_cv_search_strerror=no +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); int main () { -#ifndef __GNUC__ - choke me -#endif - +strerror (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_compiler_gnu=yes + ac_cv_search_strerror="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_strerror" = no; then + for ac_lib in cposix; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror (); int main () { - +strerror (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cxx_g=yes + ac_cv_search_strerror="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi +LIBS=$ac_func_search_save_LIBS fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' +echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6 +if test "$ac_cv_search_strerror" != no; then + test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err 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 +# 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 -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - + done + ac_cv_prog_CPP=$CPP -if test "$CXX" != ""; then - HAVE_CPLUSPLUS_TRUE= - HAVE_CPLUSPLUS_FALSE='#' -else - HAVE_CPLUSPLUS_TRUE='#' - HAVE_CPLUSPLUS_FALSE= fi - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. -set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$LD"; then - ac_cv_prog_LD="$LD" # Let the user override the test. + CPP=$ac_cv_prog_CPP else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LD="${ac_tool_prefix}ld" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -LD=$ac_cv_prog_LD -if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - + ac_cv_prog_CPP=$CPP fi -if test -z "$ac_cv_prog_LD"; then - ac_ct_LD=$LD - # Extract the first word of "ld", so it can be a program name with args. -set dummy ld; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_LD"; then - ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_LD="ld" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD="ld" -fi -fi -ac_ct_LD=$ac_cv_prog_ac_ct_LD -if test -n "$ac_ct_LD"; then - echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 -echo "${ECHO_T}$ac_ct_LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - LD=$ac_ct_LD -else - LD="$ac_cv_prog_LD" -fi - - -PACKAGE=dpkg - -VERSION=`cat $srcdir/version-nr` - - - -# Check whether --enable-largefile or --disable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" - -fi; -if test "$enable_largefile" != no; then - - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_largefile_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue fi -rm -f conftest.err conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi -rm -f conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_file_offset_bits+set}" = set; then + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - while :; do - ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +#include +#include +#include +#include + int main () { @@ -3132,32 +3821,187 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + int main () { +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif ; return 0; @@ -3184,52 +4028,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sys_file_offset_bits=64; break + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_c_const=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - break -done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 -if test "$ac_cv_sys_file_offset_bits" != no; then +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +cat >>confdefs.h <<\_ACEOF +#define const _ACEOF fi -rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_large_files+set}" = set; then + + + echo "$as_me:$LINENO: checking for signed" >&5 +echo $ECHO_N "checking for signed... $ECHO_C" >&6 +if test "${bh_cv_c_signed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - while :; do - ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + int main () { - +signed char x; ; return 0; } @@ -3255,36 +4089,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break + bh_cv_c_signed=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +bh_cv_c_signed=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5 +echo "${ECHO_T}$bh_cv_c_signed" >&6 + if test $bh_cv_c_signed = no; then + +cat >>confdefs.h <<\_ACEOF +#define signed +_ACEOF + + fi + +echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -3307,697 +4149,3434 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sys_large_files=1; break + ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - break done -fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 -if test "$ac_cv_sys_large_files" != no; then - -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF fi -rm -f conftest* -fi - +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif _ACEOF + ;; +esac +# On IRIX 5.3, sys/types and inttypes.h are conflicting. -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -test "$program_prefix" != NONE && - 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" -# 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,$// +#include <$ac_header> _ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +echo "$as_me:$LINENO: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.make <<\_ACEOF -all: - @echo 'ac_maketemp="$(MAKE)"' + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_off_t=yes else - eval ac_cv_prog_make_${ac_make}_set=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_off_t=no fi -rm -f conftest.make +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi +cat >>confdefs.h <<_ACEOF +#define off_t long +_ACEOF -echo "$as_me:$LINENO: checking dpkg version" >&5 -echo $ECHO_N "checking dpkg version... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $VERSION" >&5 -echo "${ECHO_T}$VERSION" >&6 - - - -# OpenBSD has decided to be odd and includ a version number -# in the final field of the GNU system type. -# This code strips it out in a generic way. -os_type='' -echo "$as_me:$LINENO: checking Operating system type" >&5 -echo $ECHO_N "checking Operating system type... $ECHO_C" >&6 -case $target_os in - *linux-gnu* ) - os_type="linux-gnu";; - *linux* ) - os_type="linux-gnu";; - *openbsd* ) - os_type="openbsd";; - *knetbsd*-gnu* ) - os_type="knetbsd-gnu";; - *netbsd* ) - os_type="netbsd";; - *kfreebsd*-gnu* ) - os_type="kfreebsd-gnu";; - *freebsd* ) - os_type="freebsd";; - gnu ) - os_type="hurd";; -esac -if test "x$os_type" = "x"; then - os_type=$target_os fi -echo "$as_me:$LINENO: result: $os_type" >&5 -echo "${ECHO_T}$os_type" >&6 +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_size_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -dpkg_archset='' -echo "$as_me:$LINENO: checking Debian architecture" >&5 -echo $ECHO_N "checking Debian architecture... $ECHO_C" >&6 -dpkg_archset="`awk '$1 == "'$target_cpu-$os_type'" { print $2 }' $srcdir/archtable`" -# Finish off -if test "x$dpkg_archset" = "x"; then - echo "$as_me:$LINENO: result: $target_cpu-$os_type, but not found in archtable" >&5 -echo "${ECHO_T}$target_cpu-$os_type, but not found in archtable" >&6 - dpkg_archset=$target_cpu-$os_type - else - echo "$as_me:$LINENO: result: $dpkg_archset" >&5 -echo "${ECHO_T}$dpkg_archset" >&6 +ac_cv_type_size_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else cat >>confdefs.h <<_ACEOF -#define ARCHITECTURE "${dpkg_archset}" +#define size_t unsigned _ACEOF +fi -ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ro ru sk sv tl zh_CN zh_TW" -# 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: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then + echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +long long ll = 1LL; int i = 63; +int +main () +{ +long long llmax = (long long) -1; + return ll << i | ll >> i | llmax / ll | llmax % ll; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_type_long_long=no fi - if test "${ac_cv_path_install+set}" = set; then - 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 - fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 + if test $ac_cv_type_long_long = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_LONG 1 +_ACEOF - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" fi - - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval + echo "$as_me:$LINENO: checking for long double" >&5 +echo $ECHO_N "checking for long double... $ECHO_C" >&6 +if test "${gt_cv_c_long_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - USE_NLS=yes -fi; - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 + if test "$GCC" = yes; then + gt_cv_c_long_double=yes + else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + int array [2*(sizeof(long double) >= sizeof(double)) - 1]; +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_c_long_double=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +gt_cv_c_long_double=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi +fi +echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5 +echo "${ECHO_T}$gt_cv_c_long_double" >&6 + if test $gt_cv_c_long_double = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_DOUBLE 1 +_ACEOF -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: fi - rm -f conf$$.sh -fi -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then + echo "$as_me:$LINENO: checking for wchar_t" >&5 +echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 +if test "${gt_cv_c_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$MSGFMT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + wchar_t foo = (wchar_t)'\0'; +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_c_wchar_t=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_c_wchar_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 +echo "${ECHO_T}$gt_cv_c_wchar_t" >&6 + if test $gt_cv_c_wchar_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WCHAR_T 1 +_ACEOF - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 fi -done -done - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 + echo "$as_me:$LINENO: checking for wint_t" >&5 +echo $ECHO_N "checking for wint_t... $ECHO_C" >&6 +if test "${gt_cv_c_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + wint_t foo = (wchar_t)'\0'; +int +main () +{ -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_c_wint_t=yes else - ac_executable_p="test -f" -fi -rm -f conf$$.file + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac +gt_cv_c_wint_t=no fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 +echo "${ECHO_T}$gt_cv_c_wint_t" >&6 + if test $gt_cv_c_wint_t = yes; then - rm -f messages.po - +cat >>confdefs.h <<\_ACEOF +#define HAVE_WINT_T 1 +_ACEOF -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: fi - rm -f conf$$.sh -fi -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGMERGE+set}" = set; then + echo "$as_me:$LINENO: checking for inttypes.h" >&5 +echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 +if test "${jm_ac_cv_header_inttypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$MSGMERGE" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" - ;; -esac -fi -MSGMERGE="$ac_cv_path_MSGMERGE" -if test "$MSGMERGE" != ":"; then - echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +uintmax_t i = (uintmax_t) -1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + jm_ac_cv_header_inttypes_h=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +jm_ac_cv_header_inttypes_h=no fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6 + if test $jm_ac_cv_header_inttypes_h = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 +_ACEOF - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 - GMSGFMT=":" - fi fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 - XGETTEXT=":" - fi - rm -f messages.po - fi - ac_config_commands="$ac_config_commands default-1" + echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6 +if test "${jm_ac_cv_header_stdint_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +uintmax_t i = (uintmax_t) -1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + jm_ac_cv_header_stdint_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +jm_ac_cv_header_stdint_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 +echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 + if test $jm_ac_cv_header_stdint_h = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H_WITH_UINTMAX 1 +_ACEOF - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi; -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -fi -if test "${acl_cv_path_LD+set}" = set; then + + + echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 +if test "${gt_cv_c_intmax_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -LD="$acl_cv_path_LD" -if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif + +int +main () +{ +intmax_t x = -1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_c_intmax_t=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_c_intmax_t=no fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${acl_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 -with_gnu_ld=$acl_cv_prog_gnu_ld +echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 +echo "${ECHO_T}$gt_cv_c_intmax_t" >&6 + if test $gt_cv_c_intmax_t = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_INTMAX_T 1 +_ACEOF + fi - echo "$as_me:$LINENO: checking for shared library run path origin" >&5 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 -if test "${acl_cv_rpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done -fi -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 -echo "${ECHO_T}$acl_cv_rpath" >&6 - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - # Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - : + echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5 +echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6 +if test "${gt_cv_func_printf_posix+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - enable_rpath=yes -fi; - + + if test "$cross_compiling" = yes; then + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "notposix" >/dev/null 2>&1; then + gt_cv_func_printf_posix="guessing no" +else + gt_cv_func_printf_posix="guessing yes" +fi +rm -f conftest* + + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_func_printf_posix=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gt_cv_func_printf_posix=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi +echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5 +echo "${ECHO_T}$gt_cv_func_printf_posix" >&6 + case $gt_cv_func_printf_posix in + *yes) + +cat >>confdefs.h <<\_ACEOF +#define HAVE_POSIX_PRINTF 1 +_ACEOF + + ;; + esac + +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_working_alloca_h=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALLOCA_H 1 +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +int +main () +{ +char *p = (char *) alloca (1); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_alloca_works=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_alloca_works=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 + +if test $ac_cv_func_alloca_works = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ALLOCA 1 +_ACEOF + +else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\_ACEOF +#define C_ALLOCA 1 +_ACEOF + + +echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#if defined(CRAY) && ! defined(CRAY2) +webecray +#else +wenotbecray +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "webecray" >/dev/null 2>&1; then + ac_cv_os_cray=yes +else + ac_cv_os_cray=no +fi +rm -f conftest* + +fi +echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6 +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + +cat >>confdefs.h <<_ACEOF +#define CRAY_STACKSEG_END $ac_func +_ACEOF + + break +fi + + done +fi + +echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +find_stack_direction () +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -1; +} + +int +main () +{ + exit (find_stack_direction () < 0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_stack_direction=-1 +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 + +cat >>confdefs.h <<_ACEOF +#define STACK_DIRECTION $ac_cv_c_stack_direction +_ACEOF + + +fi + + + +for ac_header in stdlib.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_func in getpagesize +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +echo "$as_me:$LINENO: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc + +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. + + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ + +#include +#include + +#if !STDC_HEADERS && !HAVE_STDLIB_H +char *malloc (); +#endif + +/* This mess was copied from the GNU getpagesize.h. */ +#if !HAVE_GETPAGESIZE +/* Assume that all systems that can run configure have sys/param.h. */ +# if !HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 +# endif + +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# if HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ + +#endif /* no HAVE_GETPAGESIZE */ + +int +main () +{ + char *data, *data2, *data3; + int i, pagesize; + int fd; + + pagesize = getpagesize (); + + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + exit (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + exit (1); + if (write (fd, data, pagesize) != pagesize) + exit (1); + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + exit (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + exit (1); + data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + exit (1); + if (read (fd, data3, pagesize) != pagesize) + exit (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit (1); + close (fd); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_mmap_fixed_mapped=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 +if test $ac_cv_func_mmap_fixed_mapped = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MMAP 1 +_ACEOF + +fi +rm -f conftest.mmap + + + echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 +if test "${ac_cv_gnu_library_2_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then + ac_cv_gnu_library_2_1=yes +else + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + + +fi +echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 +echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 + + GLIBC21="$ac_cv_gnu_library_2_1" + + + + + echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5 +echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6 +if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i3456786 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +static void +#ifdef __cplusplus +sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_int_divbyzero_sigfpe=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gt_cv_int_divbyzero_sigfpe=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi +echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5 +echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6 + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + +cat >>confdefs.h <<_ACEOF +#define INTDIV0_RAISES_SIGFPE $value +_ACEOF + + + + echo "$as_me:$LINENO: checking for unsigned long long" >&5 +echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6 +if test "${ac_cv_type_unsigned_long_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +unsigned long long ull = 1ULL; int i = 63; +int +main () +{ +unsigned long long ullmax = (unsigned long long) -1; + return ull << i | ull >> i | ullmax / ull | ullmax % ull; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_unsigned_long_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_unsigned_long_long=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6 + if test $ac_cv_type_unsigned_long_long = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UNSIGNED_LONG_LONG 1 +_ACEOF + + fi + + + + + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + +cat >>confdefs.h <<_ACEOF +#define uintmax_t $ac_type +_ACEOF + + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UINTMAX_T 1 +_ACEOF + + fi + + + echo "$as_me:$LINENO: checking for inttypes.h" >&5 +echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 +if test "${gt_cv_header_inttypes_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_header_inttypes_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_header_inttypes_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6 + if test $gt_cv_header_inttypes_h = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H 1 +_ACEOF + + fi + + + + if test $gt_cv_header_inttypes_h = yes; then + echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 +echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6 +if test "${gt_cv_inttypes_pri_broken+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#ifdef PRId32 +char *p = PRId32; +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_inttypes_pri_broken=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_inttypes_pri_broken=yes +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 +echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6 + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + +cat >>confdefs.h <<_ACEOF +#define PRI_MACROS_BROKEN 1 +_ACEOF + + fi + + + +for ac_header in stdint.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + echo "$as_me:$LINENO: checking for SIZE_MAX" >&5 +echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6 + result= + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Found it" >/dev/null 2>&1; then + result=yes +fi +rm -f conftest* + + if test -z "$result"; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) res_hi=$ac_lo;; +'') result=? ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +long longval () { return ~(size_t)0 / 10; } +unsigned long ulongval () { return ~(size_t)0 / 10; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if ((~(size_t)0 / 10) < 0) + { + long i = longval (); + if (i != (~(size_t)0 / 10)) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != (~(size_t)0 / 10)) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + res_hi=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +result=? +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) res_lo=$ac_lo;; +'') result=? ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +long longval () { return ~(size_t)0 % 10; } +unsigned long ulongval () { return ~(size_t)0 % 10; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if ((~(size_t)0 % 10) < 0) + { + long i = longval (); + if (i != (~(size_t)0 % 10)) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != (~(size_t)0 % 10)) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + res_lo=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +result=? +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) fits_in_uint=$ac_lo;; +'') result=? ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +long longval () { return sizeof (size_t) <= sizeof (unsigned int); } +unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if ((sizeof (size_t) <= sizeof (unsigned int)) < 0) + { + long i = longval (); + if (i != (sizeof (size_t) <= sizeof (unsigned int))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != (sizeof (size_t) <= sizeof (unsigned int))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + fits_in_uint=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +result=? +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.val + if test "$fits_in_uint" = 1; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + extern size_t foo; + extern unsigned long foo; + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + fits_in_uint=0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + result='~(size_t)0' + fi + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + if test "$result" != yes; then + +cat >>confdefs.h <<_ACEOF +#define SIZE_MAX $result +_ACEOF + + fi + + + + +for ac_header in stdint.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" + + +# Check whether --with-gnu-ld or --without-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi; +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo "$as_me:$LINENO: checking for ld used by GCC" >&5 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +else + echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +fi +if test "${acl_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi +fi + +LD="$acl_cv_path_LD" +if test -n "$LD"; then + echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +if test "${acl_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 &5 +echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 +with_gnu_ld=$acl_cv_prog_gnu_ld + + + + echo "$as_me:$LINENO: checking for shared library run path origin" >&5 +echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 +if test "${acl_cv_rpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + +fi +echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 +echo "${ECHO_T}$acl_cv_rpath" >&6 + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" + : +else + enable_rpath=yes +fi; + @@ -4006,385 +7585,1103 @@ fi; use_additional=yes - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then + withval="$with_libiconv_prefix" + + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi; + LIBICONV= + LTLIBICONV= + INCICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi + + + + + + + + + echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 +echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 +if test "${ac_cv_type_ptrdiff_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((ptrdiff_t *) 0) + return 0; +if (sizeof (ptrdiff_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_ptrdiff_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_ptrdiff_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 +echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 +if test $ac_cv_type_ptrdiff_t = yes; then + : +else + +cat >>confdefs.h <<\_ACEOF +#define ptrdiff_t long +_ACEOF + + +fi + + + + + + + + + + + +for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + + + + + + + + + + + + + + + + + + + +for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ +__fsetlocking +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5 +echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl__snprintf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + +#ifndef _snprintf + char *p = (char *) _snprintf; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl__snprintf=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_have_decl__snprintf=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5 +echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6 + if test $ac_cv_have_decl__snprintf = yes; then + gt_value=1 + else + gt_value=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL__SNPRINTF $gt_value +_ACEOF + + + + echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5 +echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl__snwprintf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + +#ifndef _snwprintf + char *p = (char *) _snwprintf; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl__snwprintf=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_have_decl__snwprintf=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5 +echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6 + if test $ac_cv_have_decl__snwprintf = yes; then + gt_value=1 + else + gt_value=0 + fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL__SNWPRINTF $gt_value +_ACEOF - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then - withval="$with_libiconv_prefix" + echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5 +echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then +#ifndef feof_unlocked + char *p = (char *) feof_unlocked; +#endif - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_feof_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" +ac_cv_have_decl_feof_unlocked=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6 + if test $ac_cv_have_decl_feof_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FEOF_UNLOCKED $gt_value +_ACEOF - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -fi; - LIBICONV= - LTLIBICONV= - INCICONV= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5 +echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBICONV; do +#ifndef fgets_unlocked + char *p = (char *) fgets_unlocked; +#endif - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_fgets_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_have_decl_fgets_unlocked=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6 + if test $ac_cv_have_decl_fgets_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCICONV; do +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FGETS_UNLOCKED $gt_value +_ACEOF - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5 +echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do +#ifndef getc_unlocked + char *p = (char *) getc_unlocked; +#endif - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_getc_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done +ac_cv_have_decl_getc_unlocked=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6 + if test $ac_cv_have_decl_getc_unlocked = yes; then + gt_value=1 + else + gt_value=0 fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED $gt_value +_ACEOF + case $gt_cv_func_printf_posix in + *yes) HAVE_POSIX_PRINTF=1 ;; + *) HAVE_POSIX_PRINTF=0 ;; + esac + + if test "$ac_cv_func_asprintf" = yes; then + HAVE_ASPRINTF=1 + else + HAVE_ASPRINTF=0 + fi + if test "$ac_cv_func_snprintf" = yes; then + HAVE_SNPRINTF=1 + else + HAVE_SNPRINTF=0 + fi + if test "$ac_cv_func_wprintf" = yes; then + HAVE_WPRINTF=1 + else + HAVE_WPRINTF=0 + fi @@ -4392,31 +8689,53 @@ fi; + am_save_CPPFLAGS="$CPPFLAGS" + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done - echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5 -echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6 -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then + echo "$as_me:$LINENO: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6 +if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -CFPreferencesCopyAppValue(NULL, NULL) +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -4442,47 +8761,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_func_CFPreferencesCopyAppValue=yes + am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_CFPreferencesCopyAppValue=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" -fi -echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6 - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 -_ACEOF - - fi - echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5 -echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6 -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" - gt_save_LIBS="$LIBS" - LIBS="$LIBS -framework CoreFoundation" - cat >conftest.$ac_ext <<_ACEOF + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -CFLocaleCopyCurrent(); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -4508,65 +8811,123 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_func_CFLocaleCopyCurrent=yes + am_cv_lib_iconv=yes + am_cv_func_iconv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_CFLocaleCopyCurrent=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" + LIBS="$am_save_LIBS" + fi + fi -echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6 - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then +echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 +echo "${ECHO_T}$am_cv_func_iconv" >&6 + if test "$am_cv_func_iconv" = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_CFLOCALECOPYCURRENT 1 +#define HAVE_ICONV 1 _ACEOF fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + if test "$am_cv_lib_iconv" = yes; then + echo "$as_me:$LINENO: checking how to link with libiconv" >&5 +echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $LIBICONV" >&5 +echo "${ECHO_T}$LIBICONV" >&6 + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= fi - - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval + if test "$am_cv_func_iconv" = yes; then + echo "$as_me:$LINENO: checking for iconv declaration" >&5 +echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6 + if test "${am_cv_proto_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - USE_NLS=yes -fi; - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif - LIBINTL= - LTLIBINTL= - POSUB= +int +main () +{ - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_proto_iconv_arg1="" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +am_cv_proto_iconv_arg1="const" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +fi + am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + echo "$as_me:$LINENO: result: ${ac_t:- + }$am_cv_proto_iconv" >&5 +echo "${ECHO_T}${ac_t:- + }$am_cv_proto_iconv" >&6 +cat >>confdefs.h <<_ACEOF +#define ICONV_CONST $am_cv_proto_iconv_arg1 +_ACEOF + fi - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4575,14 +8936,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; +#include int main () { -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +char* cs = nl_langinfo(CODESET); ; return 0; } @@ -4608,72 +8966,45 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libc=yes + am_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_func_gnugettext1_libc=no +am_cv_langinfo_codeset=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 - - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - - - +fi +echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then - am_save_CPPFLAGS="$CPPFLAGS" - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_CODESET 1 +_ACEOF - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done + fi + if test $ac_cv_header_locale_h = yes; then - echo "$as_me:$LINENO: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -if test "${am_cv_func_iconv+set}" = set; then + echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 +if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +#include int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +return LC_MESSAGES ; return 0; } @@ -4699,31 +9030,167 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_func_iconv=yes + am_cv_val_LC_MESSAGES=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +am_cv_val_LC_MESSAGES=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 + if test $am_cv_val_LC_MESSAGES = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LC_MESSAGES 1 +_ACEOF + + fi + + fi + + for ac_prog in bison +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_INTLBISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_INTLBISON="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +INTLBISON=$ac_cv_prog_INTLBISON +if test -n "$INTLBISON"; then + echo "$as_me:$LINENO: result: $INTLBISON" >&5 +echo "${ECHO_T}$INTLBISON" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$INTLBISON" && break +done + + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + echo "$as_me:$LINENO: checking version of bison" >&5 +echo $ECHO_N "checking version of bison... $ECHO_C" >&6 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +echo "${ECHO_T}$ac_prog_version" >&6 + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + + + + + + + + + + + + + + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 + # Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF + + + + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + + LIBINTL= + LTLIBINTL= + POSUB= + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 +echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 + +# Check whether --with-included-gettext or --without-included-gettext was given. +if test "${with_included_gettext+set}" = set; then + withval="$with_included_gettext" + nls_cv_force_use_gnu_gettext=$withval +else + nls_cv_force_use_gnu_gettext=no +fi; + echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 +echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + + + + + + + echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 +echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 +if test "${gt_cv_func_gnugettext1_libc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +#include +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } @@ -4749,41 +9216,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_lib_iconv=yes - am_cv_func_iconv=yes + gt_cv_func_gnugettext1_libc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +gt_cv_func_gnugettext1_libc=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi - fi -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6 - if test "$am_cv_func_iconv" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF - - fi - if test "$am_cv_lib_iconv" = yes; then - echo "$as_me:$LINENO: checking how to link with libiconv" >&5 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $LIBICONV" >&5 -echo "${ECHO_T}$LIBICONV" >&6 - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - - +echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 +echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 + if test "$gt_cv_func_gnugettext1_libc" != "yes"; then @@ -4996,7 +9442,7 @@ fi; if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux*) haveit=yes;; esac fi fi @@ -5040,7 +9486,7 @@ fi; if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; + linux*) haveit=yes;; esac fi fi @@ -5184,12 +9630,12 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *); +const char *_nl_expand_alias (); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } @@ -5238,12 +9684,12 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *); +const char *_nl_expand_alias (); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } @@ -5300,14 +9746,24 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 fi + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV" + LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi - if test -n "$INTL_MACOSX_LIBS"; then if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + CATOBJEXT=.gmo fi - fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then @@ -5390,6 +9846,34 @@ _ACEOF fi + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + + + + + + nls_cv_header_intl= + nls_cv_header_libgt= + + DATADIRNAME=share + + + INSTOBJEXT=.mo + + + GENCAT=gencat + + + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + + + INTL_LIBTOOL_SUFFIX_PREFIX= + + INTLLIBS="$LIBINTL" @@ -5399,303 +9883,429 @@ _ACEOF +# Allow compilation without dselect +# Check whether --with-dselect or --without-dselect was given. +if test "${with_dselect+set}" = set; then + withval="$with_dselect" + build_dselect=$with_dselect +else + build_dselect=yes +fi; -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: +if test "x$build_dselect" = "xyes"; then + WITH_DSELECT_TRUE= + WITH_DSELECT_FALSE='#' +else + WITH_DSELECT_TRUE='#' + WITH_DSELECT_FALSE= +fi + + +# Allow compilation without start-stop-daemon + +# Check whether --with-start-stop-daemon or --without-start-stop-daemon was given. +if test "${with_start_stop_daemon+set}" = set; then + withval="$with_start_stop_daemon" + build_start_stop_daemon=$with_start_stop_daemon +else + build_start_stop_daemon=yes +fi; + + +if test "x$build_start_stop_daemon" = "xyes"; then + WITH_START_STOP_DAEMON_TRUE= + WITH_START_STOP_DAEMON_FALSE='#' +else + WITH_START_STOP_DAEMON_TRUE='#' + WITH_START_STOP_DAEMON_FALSE= +fi + +if test "x$build_start_stop_daemon" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define WITH_START_STOP_DAEMON 1 +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define WITH_START_STOP_DAEMON 0 +_ACEOF + +fi + +# Allow alternate admin directory +admindir="${localstatedir}/${PACKAGE_NAME}" + +# Check whether --with-admindir or --without-admindir was given. +if test "${with_admindir+set}" = set; then + withval="$with_admindir" + case "$with_admindir" in + "") { { echo "$as_me:$LINENO: error: invalid admindir specified" >&5 +echo "$as_me: error: invalid admindir specified" >&2;} + { (exit 1); exit 1; }; } ;; + *) admindir="$with_admindir" ;; +esac +fi; + + + +# Checks for programs. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - rm -f conf$$.sh +done +done + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" +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:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_executable_p="test -f" + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conf$$.file -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$MSGFMT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_CC="cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" + CC=$ac_ct_CC else - ac_executable_p="test -f" + CC="$ac_cv_prog_CC" fi -rm -f conf$$.file -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$XGETTEXT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 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 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - rm -f messages.po - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - ac_executable_p="test -f" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f conf$$.file -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$MSGMERGE" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" - ;; -esac + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi -MSGMERGE="$ac_cv_path_MSGMERGE" -if test "$MSGMERGE" != ":"; then - echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6 +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + test -n "$ac_ct_CC" && break +done - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 - GMSGFMT=":" - fi - fi + CC=$ac_ct_CC +fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 - XGETTEXT=":" - fi - rm -f messages.po - fi +fi - ac_config_commands="$ac_config_commands default-2" +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -if test "x$HAVE_LOCALE_H" = "x"; then - echo "$as_me:$LINENO: checking whether setlocale() is available" >&5 -echo $ECHO_N "checking whether setlocale() is available... $ECHO_C" >&6 - HAVE_SETLOCALE='' - cat >conftest.$ac_ext <<_ACEOF +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + int main () { - setlocale(0, "bar"); +#ifndef __GNUC__ + choke me +#endif + ; return 0; } @@ -5721,299 +10331,254 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - HAVE_SETLOCALE=1; - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SETLOCALE 1 -_ACEOF - - + ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_compiler_gnu=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$HAVE_SETLOCALE" = x; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP +ac_cv_c_compiler_gnu=$ac_compiler_gnu fi - CPP=$ac_cv_prog_CPP +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue +ac_cv_prog_cc_g=no fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#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; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break fi -rm -f conftest.err conftest.$ac_ext - +rm -f conftest.err conftest.$ac_objext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_declaration #include -#include -#include -#include - int main () { - +exit (42); ; return 0; } @@ -6039,261 +10604,203 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_stdc=yes + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no +continue fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +$ac_declaration int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); +exit (42); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +depcc="$CC" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + 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 + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + 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 -done -done + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # 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. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/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=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + cd .. + rm -rf conftest.dir else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + am_cv_CC_dependencies_compiler_type=none fi - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" fi +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 -fi -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RM"; then - ac_cv_prog_RM="$RM" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RM="rm -f" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -fi -fi -RM=$ac_cv_prog_RM -if test -n "$RM"; then - echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6 +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= fi -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_SED+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$SED"; then - ac_cv_prog_SED="$SED" # Let the user override the test. + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6302,7 +10809,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_SED="sed" + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6311,151 +10818,88 @@ done fi fi -SED=$ac_cv_prog_SED -if test -n "$SED"; then - echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - 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 - fi + test -n "$CXX" && break + done fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PERL+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl" - ;; -esac fi -PERL=$ac_cv_path_PERL - -if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - + test -n "$ac_ct_CXX" && break +done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" + CXX=$ac_ct_CXX +fi +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -6464,9 +10908,17 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -6477,7 +10929,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6489,46 +10941,110 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +ac_compiler_gnu=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -done - +int +main () +{ -echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_prog_cxx_g=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +$ac_declaration +#include int main () { -if ((mode_t *) 0) - return 0; -if (sizeof (mode_t)) - return 0; +exit (42); ; return 0; } @@ -6542,7 +11058,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6554,46 +11070,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_mode_t=yes + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_mode_t=no +continue fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -if test $ac_cv_type_mode_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +$ac_declaration int main () { -if ((pid_t *) 0) - return 0; -if (sizeof (pid_t)) - return 0; +exit (42); ; return 0; } @@ -6607,7 +11102,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6619,51 +11114,300 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : + +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 + +depcc="$CXX" am_compiler_list= + +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +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 + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_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 + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # 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. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/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=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF +if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= fi -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl" + ;; +esac +fi +PERL=$ac_cv_path_PERL + +if test -n "$PERL"; then + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + +# Checks for operating system services and capabilities. +# Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" + +fi; +if test "$enable_largefile" != no; then + + echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext + rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>conftest.er1 ac_status=$? @@ -6684,90 +11428,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - fi - - -for ac_func in vprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6780,88 +11451,64 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi -echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 -if test "${ac_cv_func__doprnt+set}" = set; then + echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + while :; do + ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _doprnt - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _doprnt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub__doprnt) || defined (__stub____doprnt) -choke me -#else -char (*f) () = _doprnt; -#endif -#ifdef __cplusplus -} -#endif - +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { -return f != _doprnt; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -6874,97 +11521,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func__doprnt=yes + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func__doprnt=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6 -if test $ac_cv_func__doprnt = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF - -fi - fi -done - - -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif +{ ; return 0; @@ -6991,46 +11579,51 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_const=yes + ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + break +done fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then +echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +if test "$ac_cv_sys_file_offset_bits" != no; then -cat >>confdefs.h <<\_ACEOF -#define const +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF fi - -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -if test "${ac_cv_c_bigendian+set}" = set; then +rm -f conftest* + echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include - + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros -#endif ; return 0; @@ -7057,22 +11650,32 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#define _LARGE_FILES 1 #include -#include - + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main () { -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif ; return 0; @@ -7099,45 +11702,177 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_bigendian=yes + ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_bigendian=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + break +done +fi +echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +if test "$ac_cv_sys_large_files" != no; then + +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF + +fi +rm -f conftest* +fi + +echo "$as_me:$LINENO: checking cpu type" >&5 +echo $ECHO_N "checking cpu type... $ECHO_C" >&6 +case "$target_cpu" in + i386|i486|i586|i686|pentium) + cpu_type="i386" + ;; + alpha*) + cpu_type="alpha" + ;; + arm*) + cpu_type="arm" + ;; + hppa*) + cpu_type="hppa" + ;; + sparc|sparc64) + cpu_type="sparc" + ;; + mips|mipseb) + cpu_type="mips" + ;; + powerpc|ppc) + cpu_type="powerpc" + ;; + *) + cpu_type=$target_cpu + ;; +esac +echo "$as_me:$LINENO: result: $cpu_type" >&5 +echo "${ECHO_T}$cpu_type" >&6 + +echo "$as_me:$LINENO: checking operating system type" >&5 +echo $ECHO_N "checking operating system type... $ECHO_C" >&6 +case "$target_os" in + linux*-gnu*) + os_type="linux" + ;; + darwin*) + os_type="darwin" + ;; + freebsd*) + os_type="freebsd" + ;; + gnu*) + os_type="gnu" + ;; + kfreebsd*-gnu*) + os_type="kfreebsd-gnu" + ;; + knetbsd*-gnu*) + os_type="knetbsd-gnu" + ;; + netbsd*) + os_type="netbsd" + ;; + openbsd*) + os_type="openbsd" + ;; + *) + os_type=$target_os + ;; +esac +echo "$as_me:$LINENO: result: $os_type" >&5 +echo "${ECHO_T}$os_type" >&6 + +echo "$as_me:$LINENO: checking Debian architecture name" >&5 +echo $ECHO_N "checking Debian architecture name... $ECHO_C" >&6 +dpkg_archset="`awk '$1 == "'$cpu_type-$os_type'" { print $2 }' $srcdir/archtable`" +if test "x$dpkg_archset" = "x"; then + dpkg_archset=$cpu_type-$os_type + echo "$as_me:$LINENO: result: $dpkg_archset, but not found in archtable" >&5 +echo "${ECHO_T}$dpkg_archset, but not found in archtable" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + echo "$as_me:$LINENO: result: $dpkg_archset" >&5 +echo "${ECHO_T}$dpkg_archset" >&6 +fi -# It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<_ACEOF +#define ARCHITECTURE "${dpkg_archset}" +_ACEOF + + + +# Checks for libraries. + +# Check whether --with-zlib or --without-zlib was given. +if test "${with_zlib+set}" = set; then + withval="$with_zlib" + case "$with_zlib" in + yes) + ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB" + ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-lz" + ;; + static) + ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB" + ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-Wl,-Bstatic -lz -Wl,-Bdynamic" + ;; +esac +fi; + + +# Check whether --with-bz2 or --without-bz2 was given. +if test "${with_bz2+set}" = set; then + withval="$with_bz2" + case "$with_bz2" in + yes) + BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2" + BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-lbz2" + ;; + static) + BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2" + BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-Wl,-Bstatic -lbz2 -Wl,-Bdynamic" + ;; +esac +fi; + +if test "x$build_dselect" = "xyes"; then + echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 +echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 +if test "${ac_cv_lib_ncurses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } + +/* 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 initscr (); int main () { - _ascii (); _ebcdic (); +initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7150,116 +11885,202 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes + ac_cv_lib_ncurses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ncurses_initscr=no fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 +if test $ac_cv_lib_ncurses_initscr = yes; then + CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses" +else + echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 +echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_curses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurses $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main () +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_initscr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_curses_initscr=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 +if test $ac_cv_lib_curses_initscr = yes; then + CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses" +else + { echo "$as_me:$LINENO: WARNING: no curses library found" >&5 +echo "$as_me: WARNING: no curses library found" >&2;} +fi + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +if test "x$build_start_stop_daemon" = "xyes"; then + echo "$as_me:$LINENO: checking for ihash_create in -lihash" >&5 +echo $ECHO_N "checking for ihash_create in -lihash... $ECHO_C" >&6 +if test "${ac_cv_lib_ihash_ihash_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lihash $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char ihash_create (); int main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long l; - char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); +ihash_create (); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_bigendian=no + ac_cv_lib_ihash_ihash_create=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_c_bigendian=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +ac_cv_lib_ihash_ihash_create=no fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_cv_lib_ihash_ihash_create" >&5 +echo "${ECHO_T}$ac_cv_lib_ihash_ihash_create" >&6 +if test $ac_cv_lib_ihash_ihash_create = yes; then + SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lihash" fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then +echo "$as_me:$LINENO: checking for proc_stat_list_create in -lps" >&5 +echo $ECHO_N "checking for proc_stat_list_create in -lps... $ECHO_C" >&6 +if test "${ac_cv_lib_ps_proc_stat_list_create+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 <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lps $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif +/* 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 proc_stat_list_create (); +int +main () +{ +proc_stat_list_create (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7272,67 +12093,61 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break + ac_cv_lib_ps_proc_stat_list_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_ps_proc_stat_list_create=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done - +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ps_proc_stat_list_create" >&5 +echo "${ECHO_T}$ac_cv_lib_ps_proc_stat_list_create" >&6 +if test $ac_cv_lib_ps_proc_stat_list_create = yes; then + SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lps" fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac -echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for fmt_past_time in -lshouldbeinlibc" >&5 +echo $ECHO_N "checking for fmt_past_time in -lshouldbeinlibc... $ECHO_C" >&6 +if test "${ac_cv_lib_shouldbeinlibc_fmt_past_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lshouldbeinlibc $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +/* 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 fmt_past_time (); int main () { -if ((unsigned long *) 0) - return 0; -if (sizeof (unsigned long)) - return 0; +fmt_past_time (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7345,56 +12160,61 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_unsigned_long=yes + ac_cv_lib_shouldbeinlibc_fmt_past_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long=no +ac_cv_lib_shouldbeinlibc_fmt_past_time=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_shouldbeinlibc_fmt_past_time" >&5 +echo "${ECHO_T}$ac_cv_lib_shouldbeinlibc_fmt_past_time" >&6 +if test $ac_cv_lib_shouldbeinlibc_fmt_past_time = yes; then + SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lshouldbeinlibc" fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 -echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5 +echo $ECHO_N "checking for kvm_openfiles in -lkvm... $ECHO_C" >&6 +if test "${ac_cv_lib_kvm_kvm_openfiles+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_unsigned_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkvm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +/* 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 kvm_openfiles (); int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; -test_array [0] = 0 - +kvm_openfiles (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -7407,26 +12227,52 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF + ac_cv_lib_kvm_kvm_openfiles=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_kvm_kvm_openfiles=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_openfiles" >&5 +echo "${ECHO_T}$ac_cv_lib_kvm_kvm_openfiles" >&6 +if test $ac_cv_lib_kvm_kvm_openfiles = yes; then + SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lkvm" +fi + + +fi + +# Checks for header files. +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include +#include +#include +#include + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; -test_array [0] = 0 ; return 0; @@ -7453,41 +12299,153 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid; break + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_cv_header_stdc=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f conftest* -cat >conftest.$ac_ext <<_ACEOF +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; -test_array [0] = 0 - - ; - return 0; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); } _ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + + + + +for ac_header in error.h sys/cdefs.h kvm.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>conftest.er1 @@ -7509,20 +12467,126 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +echo "$as_me:$LINENO: checking whether TIOCNOTTY is defined in sys/ioctl.h" >&5 +echo $ECHO_N "checking whether TIOCNOTTY is defined in sys/ioctl.h... $ECHO_C" >&6 +if test "${dpkg_cv_define_TIOCNOTTY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; -test_array [0] = 0 +int i = TIOCNOTTY; ; return 0; @@ -7549,44 +12613,53 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=$ac_mid; break + dpkg_cv_define_TIOCNOTTY=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +dpkg_cv_define_TIOCNOTTY=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done +fi +echo "$as_me:$LINENO: result: $dpkg_cv_define_TIOCNOTTY" >&5 +echo "${ECHO_T}$dpkg_cv_define_TIOCNOTTY" >&6 +if test "x$dpkg_cv_define" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TIOCNOTTY 1 +_ACEOF + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + cat >>confdefs.h <<\_ACEOF +#define HAVE_TIOCNOTTY 0 +_ACEOF -ac_lo= ac_hi= -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF + + +# Checks for typedefs, structures, and compiler characteristics. +echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include +#include + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; -test_array [0] = 0 +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif ; return 0; @@ -7613,125 +12686,80 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_lo=`expr '(' $ac_mid ')' + 1` -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; -esac -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF + # It does; now see whether it defined to BIG_ENDIAN or not. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -long longval () { return (long) (sizeof (unsigned long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long)); } -#include -#include +#include +#include + int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (unsigned long))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_unsigned_long=`cat conftest.val` + ac_cv_c_bigendian=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +ac_cv_c_bigendian=no fi -rm -f conftest.val +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else - ac_cv_sizeof_unsigned_long=0 -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: 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 +# It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () { -if ((unsigned int *) 0) - return 0; -if (sizeof (unsigned int)) - return 0; + _ascii (); _ebcdic (); ; return 0; } @@ -7757,82 +12785,148 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_unsigned_int=yes + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_int=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6 - -echo "$as_me:$LINENO: 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 - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= 0)]; -test_array [0] = 0 - - ; - return 0; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF + ac_cv_c_bigendian=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_bigendian=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +case $ac_cv_c_bigendian in + yes) + +cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac + +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; -test_array [0] = 0 +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif ; return 0; @@ -7859,40 +12953,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid; break + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_cv_c_const=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define const +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) < 0)]; -test_array [0] = 0 +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -7915,21 +13013,53 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF + ac_cv_c_inline=$ac_kw; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 + + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + +echo "$as_me:$LINENO: checking for working volatile" >&5 +echo $ECHO_N "checking for working volatile... $ECHO_C" >&6 +if test "${ac_cv_c_volatile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= $ac_mid)]; -test_array [0] = 0 +volatile int x; +int * volatile y; ; return 0; } @@ -7955,44 +13085,64 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=$ac_mid; break + ac_cv_c_volatile=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_cv_c_volatile=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 +echo "${ECHO_T}$ac_cv_c_volatile" >&6 +if test $ac_cv_c_volatile = no; then + +cat >>confdefs.h <<\_ACEOF +#define volatile +_ACEOF + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + +echo "$as_me:$LINENO: checking whether compiler supports C99 features" >&5 +echo $ECHO_N "checking whether compiler supports C99 features... $ECHO_C" >&6 +if test "${dpkg_cv_c99+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +#include +#include +#include + + +/* Variadic macro arguments */ +#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__) + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; -test_array [0] = 0 + + /* Compound initialisers */ + struct { int a, b; } foo = { .a = 1, .b = 2 }; + + /* Boolean type */ + bool bar = false; + + /* Specific size type */ + uint32_t baz = 0; + + /* C99-style for-loop declarations */ + for (int i = 0; i < 10; i++) + continue; + + /* Magic __func__ variable */ + printf("%s", __func__); ; return 0; @@ -8019,109 +13169,124 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid + dpkg_cv_c99=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +dpkg_cv_c99=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_unsigned_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned int), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; -esac +fi +echo "$as_me:$LINENO: result: $dpkg_cv_c99" >&5 +echo "${ECHO_T}$dpkg_cv_c99" >&6 +if test "x$dpkg_cv_c99" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_C99 1 +_ACEOF + else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:$LINENO: checking what argument makes compiler support C99 features" >&5 +echo $ECHO_N "checking what argument makes compiler support C99 features... $ECHO_C" >&6 +if test "${dpkg_cv_c99_arg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + dpkg_cv_c99_arg=none + dpkg_save_CC="$CC" + for arg in "-std=gnu99" "-std=c99" "-c99"; do + CC="$dpkg_save_CC $arg" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -long longval () { return (long) (sizeof (unsigned int)); } -unsigned long ulongval () { return (long) (sizeof (unsigned int)); } + #include -#include +#include +#include + + +/* Variadic macro arguments */ +#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__) + int main () { - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (unsigned int))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (unsigned int)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned int)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); + /* Compound initialisers */ + struct { int a, b; } foo = { .a = 1, .b = 2 }; + + /* Boolean type */ + bool bar = false; + + /* Specific size type */ + uint32_t baz = 0; + + /* C99-style for-loop declarations */ + for (int i = 0; i < 10; i++) + continue; + + /* Magic __func__ variable */ + printf("%s", __func__); ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_unsigned_int=`cat conftest.val` + dpkg_arg_worked=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned int), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +dpkg_arg_worked=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_unsigned_int=0 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CC="$dpkg_save_CC" + + if test "x$dpkg_arg_worked" = "xyes"; then + dpkg_cv_c99_arg="$arg"; break fi + + done fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int +echo "$as_me:$LINENO: result: $dpkg_cv_c99_arg" >&5 +echo "${ECHO_T}$dpkg_cv_c99_arg" >&6 + if test "x$dpkg_cv_c99_arg" != "xnone"; then + CC="$CC $dpkg_cv_c99_arg" + cat >>confdefs.h <<\_ACEOF +#define HAVE_C99 1 _ACEOF +fi -echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 -echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 -if test "${ac_cv_type_ptrdiff_t+set}" = set; then +fi + +echo "$as_me:$LINENO: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8134,9 +13299,9 @@ $ac_includes_default int main () { -if ((ptrdiff_t *) 0) +if ((mode_t *) 0) return 0; -if (sizeof (ptrdiff_t)) +if (sizeof (mode_t)) return 0; ; return 0; @@ -8163,40 +13328,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_ptrdiff_t=yes + ac_cv_type_mode_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ptrdiff_t=no +ac_cv_type_mode_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 -echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 -if test $ac_cv_type_ptrdiff_t = yes; then +echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +if test $ac_cv_type_mode_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define ptrdiff_t int +#define mode_t int _ACEOF fi - - - - - - - -for ac_func in unsetenv alphasort scandir strerror strsignal strtoul setsid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8205,54 +13360,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - +$ac_includes_default int main () { -return f != $ac_func; +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8265,41 +13387,36 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_type_pid_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define pid_t int _ACEOF fi -done - - - -for ac_func in vsnprintf lchown snprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8308,54 +13425,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - +$ac_includes_default int main () { -return f != $ac_func; +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8368,58 +13452,55 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned _ACEOF fi -done - - - -for ac_header in sys/cdefs.h syslog.h stddef.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 +echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6 +if test "${ac_cv_type_ptrdiff_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +int +main () +{ +if ((ptrdiff_t *) 0) + return 0; +if (sizeof (ptrdiff_t)) + return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -8442,134 +13523,49 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_type_ptrdiff_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_type_ptrdiff_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5 +echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6 +if test $ac_cv_type_ptrdiff_t = yes; then + : else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define ptrdiff_t int _ACEOF fi -done - - - -for ac_header in error.h locale.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: 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 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +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:$LINENO: \"$ac_compile\"") >&5 @@ -8592,133 +13588,82 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_type_unsigned_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_type_unsigned_int=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: 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 + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 -echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6 -if test "${ac_cv_have_decl_sys_siglist+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -/* NetBSD declares sys_siglist in unistd.h. */ -#if HAVE_UNISTD_H -# include -#endif - - +$ac_includes_default int main () { -#ifndef sys_siglist - char *p = (char *) sys_siglist; -#endif +static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; +test_array [0] = 0 ; return 0; @@ -8745,66 +13690,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_decl_sys_siglist=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_sys_siglist=no +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 -echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6 -if test $ac_cv_have_decl_sys_siglist = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SYS_SIGLIST 1 -_ACEOF - - + done else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SYS_SIGLIST 0 -_ACEOF - - -fi - - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking for ihash_create in -lihash" >&5 -echo $ECHO_N "checking for ihash_create in -lihash... $ECHO_C" >&6 -if test "${ac_cv_lib_ihash_ihash_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lihash $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char ihash_create (); +$ac_includes_default int main () { -ihash_create (); +static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) < 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8817,61 +13740,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_ihash_ihash_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ihash_ihash_create=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ihash_ihash_create" >&5 -echo "${ECHO_T}$ac_cv_lib_ihash_ihash_create" >&6 -if test $ac_cv_lib_ihash_ihash_create = yes; then - SSD_LIBS="-lihash $SSD_LIBS" -fi - -echo "$as_me:$LINENO: checking for proc_stat_list_create in -lps" >&5 -echo $ECHO_N "checking for proc_stat_list_create in -lps... $ECHO_C" >&6 -if test "${ac_cv_lib_ps_proc_stat_list_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lps $LIBS" -cat >conftest.$ac_ext <<_ACEOF + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 proc_stat_list_create (); +$ac_includes_default int main () { -proc_stat_list_create (); +static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8884,61 +13780,58 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_ps_proc_stat_list_create=yes + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ps_proc_stat_list_create=no +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ps_proc_stat_list_create" >&5 -echo "${ECHO_T}$ac_cv_lib_ps_proc_stat_list_create" >&6 -if test $ac_cv_lib_ps_proc_stat_list_create = yes; then - SSD_LIBS="-lps $SSD_LIBS" +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$as_me:$LINENO: checking for fmt_past_time in -lshouldbeinlibc" >&5 -echo $ECHO_N "checking for fmt_past_time in -lshouldbeinlibc... $ECHO_C" >&6 -if test "${ac_cv_lib_shouldbeinlibc_fmt_past_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lshouldbeinlibc $LIBS" -cat >conftest.$ac_ext <<_ACEOF +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 fmt_past_time (); +$ac_includes_default int main () { -fmt_past_time (); +static int test_array [1 - 2 * !(((long) (sizeof (unsigned int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -8951,61 +13844,138 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_int=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned int), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +long longval () { return (long) (sizeof (unsigned int)); } +unsigned long ulongval () { return (long) (sizeof (unsigned int)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (unsigned int))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (unsigned int)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (unsigned int)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_shouldbeinlibc_fmt_past_time=yes + ac_cv_sizeof_unsigned_int=`cat conftest.val` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_shouldbeinlibc_fmt_past_time=no +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned int), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_lib_shouldbeinlibc_fmt_past_time" >&5 -echo "${ECHO_T}$ac_cv_lib_shouldbeinlibc_fmt_past_time" >&6 -if test $ac_cv_lib_shouldbeinlibc_fmt_past_time = yes; then - SSD_LIBS="-lshouldbeinlibc $SSD_LIBS" fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_int=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int +_ACEOF -echo "$as_me:$LINENO: checking for kvm_openfiles in -lkvm" >&5 -echo $ECHO_N "checking for kvm_openfiles in -lkvm... $ECHO_C" >&6 -if test "${ac_cv_lib_kvm_kvm_openfiles+set}" = set; then + +echo "$as_me:$LINENO: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lkvm $LIBS" -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char kvm_openfiles (); +$ac_includes_default int main () { -kvm_openfiles (); +if ((unsigned long *) 0) + return 0; +if (sizeof (unsigned long)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -9018,65 +13988,56 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_kvm_kvm_openfiles=yes + ac_cv_type_unsigned_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_kvm_kvm_openfiles=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +ac_cv_type_unsigned_long=no fi -echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_openfiles" >&5 -echo "${ECHO_T}$ac_cv_lib_kvm_kvm_openfiles" >&6 -if test $ac_cv_lib_kvm_kvm_openfiles = yes; then - SSD_LIBS="-lkvm $SSD_LIBS" +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 - - -# check for the proper curses library. This can be either -# -lcurses or -lncurses, we need to check for either one. -echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 -echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 -if test "${ac_cv_lib_ncurses_initscr+set}" = set; then +echo "$as_me:$LINENO: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" + if test "$ac_cv_type_unsigned_long" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 initscr (); +$ac_includes_default int main () { -initscr (); +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -9089,60 +14050,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_ncurses_initscr=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ncurses_initscr=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 -if test $ac_cv_lib_ncurses_initscr = yes; then - CURSES_LIBS="-lncurses $CURSES_LIBS" -else - echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 -echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* 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 initscr (); +$ac_includes_default int main () { -initscr (); +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -9155,56 +14090,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_curses_initscr=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_curses_initscr=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 -if test $ac_cv_lib_curses_initscr = yes; then - CURSES_LIBS="-lcurses $CURSES_LIBS" -fi - -fi - -if test "x$CURSES_LIBS" = "x"; then - { echo "$as_me:$LINENO: WARNING: no curses library found" >&5 -echo "$as_me: WARNING: no curses library found" >&2;} +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - - -echo "$as_me:$LINENO: checking if TIOCNOTTY is defined in sys/ioctl.h" >&5 -echo $ECHO_N "checking if TIOCNOTTY is defined in sys/ioctl.h... $ECHO_C" >&6 -if test "${ac_cv_define_TIOCNOTTY+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done else - cat >conftest.$ac_ext <<_ACEOF + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include - +$ac_includes_default int main () { - -int i = TIOCNOTTY; +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; +test_array [0] = 0 ; return 0; @@ -9231,95 +14152,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_define_TIOCNOTTY=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_define_TIOCNOTTY=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_define_TIOCNOTTY" >&5 -echo "${ECHO_T}$ac_cv_define_TIOCNOTTY" >&6 - if test "$ac_cv_define_TIOCNOTTY" = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIOCNOTTY -_ACEOF - - fi - - -ZLIB_CFLAGS= -ZLIB_LIBS= -ZLIB_LIBS_ALSO_STATIC= - -# Check whether --with-zlib or --without-zlib was given. -if test "${with_zlib+set}" = set; then - withval="$with_zlib" - use_zlib=$withval -else - uze_zlib=no -fi; -if test "$use_zlib" != "no" ; then - ZLIB_CFLAGS=-DUSE_ZLIB - if test "$use_zlib" = "static" ; then - ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic" - if test "$ALSO_STATIC"; then - ZLIB_LIBS_ALSO_STATIC="-lz" - fi - else - ZLIB_LIBS=-lz - ZLIB_LIBS_ALSO_STATIC="-lz" - fi -fi - - - - -BZ2LIB_CFLAGS= -BZ2LIB_LIBS= -BZ2LIB_LIBS_ALSO_STATIC= - -# Check whether --with-bz2lib or --without-bz2lib was given. -if test "${with_bz2lib+set}" = set; then - withval="$with_bz2lib" - use_bz2lib=$withval -else - uze_bz2lib=no -fi; -if test "$use_bz2lib" != "no" ; then - BZ2LIB_CFLAGS=-DUSE_BZ2LIB - if test "$use_bz2lib" = "static" ; then - BZ2LIB_LIBS="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic" - if test "$ALSO_STATIC"; then - BZ2LIB_LIBS_ALSO_STATIC="-lbz2" - fi - else - BZ2LIB_LIBS=-lbz2 - BZ2LIB_LIBS_ALSO_STATIC="-lbz2" - fi -fi - - - - -cat >conftest.$ac_ext <<_ACEOF + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include - +$ac_includes_default int main () { -alphasort +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } @@ -9345,30 +14192,45 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALPHASORT_DECLARATION -_ACEOF - +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo= ac_hi= fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -cat >conftest.$ac_ext <<_ACEOF +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_includes_default int main () { +static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +test_array [0] = 0 -} inline int foo (int x) { ; return 0; } @@ -9394,28 +14256,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_INLINE -_ACEOF - + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -echo "$as_me:$LINENO: checking for va_copy" >&5 -echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 -# OpenBSD passes AC_TRY_COMPILE for va_copy even though -# it doesn't seem to exist, which is odd. We need to use -# AC_TRY_RUN. -if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot compute sizeof (unsigned long), 77 See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -9424,13 +14285,37 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default +long longval () { return (long) (sizeof (unsigned long)); } +unsigned long ulongval () { return (long) (sizeof (unsigned long)); } +#include +#include +int +main () +{ -#include -main(){ -va_list v1,v2; -va_copy(v1, v2); -exit(0);} + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (unsigned long))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (unsigned long)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (unsigned long)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + ; + return 0; +} _ACEOF rm -f conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -9443,101 +14328,58 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_VA_COPY -_ACEOF - + 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 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -echo "$as_me:$LINENO: checking for va_list assignment copy" >&5 -echo $ECHO_N "checking for va_list assignment copy... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include - -int -main () -{ - -va_list v1,v2; -v1 = v2; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: no" >&5 -echo "$as_me: error: no" >&2;} +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +fi +rm -f conftest.val +else + ac_cv_sizeof_unsigned_long=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +_ACEOF - echo "$as_me:$LINENO: checking __attribute__((,,))" >&5 -echo $ECHO_N "checking __attribute__((,,))... $ECHO_C" >&6 - if test "${dpkg_cv_c_attribute_supported+set}" = set; then +for ac_header in unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ -extern int testfunction(int x) __attribute__((,,)) - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -9560,118 +14402,134 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - dpkg_cv_c_attribute_supported=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -dpkg_cv_c_attribute_supported=no +ac_header_compiler=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 -fi - - if test "x$dpkg_cv_c_attribute_supported" = xyes; then - true - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUC25_ATTRIB -_ACEOF - - - - echo "$as_me:$LINENO: checking __attribute__((noreturn))" >&5 -echo $ECHO_N "checking __attribute__((noreturn))... $ECHO_C" >&6 - if test "${dpkg_cv_c_attribute_noreturn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ -extern int testfunction(int x) __attribute__((noreturn)) - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - dpkg_cv_c_attribute_noreturn=yes + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------- ## +## Report this to debian-dpkg@lists.debian.org ## +## ------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -dpkg_cv_c_attribute_noreturn=no + eval "$as_ac_Header=\$ac_header_preproc" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi - - if test "x$dpkg_cv_c_attribute_noreturn" = xyes; then - true - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUC25_NORETURN +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF +fi - else - true - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - - fi - - - +done - echo "$as_me:$LINENO: checking __attribute__((const))" >&5 -echo $ECHO_N "checking __attribute__((const))... $ECHO_C" >&6 - if test "${dpkg_cv_c_attribute_const+set}" = set; then +echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 +echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_sys_siglist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +/* NetBSD declares sys_siglist in unistd.h. */ +#if HAVE_UNISTD_H +# include +#endif + int main () { -extern int testfunction(int x) __attribute__((const)) +#ifndef sys_siglist + char *p = (char *) sys_siglist; +#endif + ; return 0; } @@ -9697,43 +14555,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - dpkg_cv_c_attribute_const=yes + ac_cv_have_decl_sys_siglist=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -dpkg_cv_c_attribute_const=no +ac_cv_have_decl_sys_siglist=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 +echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6 +if test $ac_cv_have_decl_sys_siglist = yes; then - if test "x$dpkg_cv_c_attribute_const" = xyes; then - true - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUC25_CONST +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SYS_SIGLIST 1 _ACEOF - else - true - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - - fi +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SYS_SIGLIST 0 +_ACEOF +fi - echo "$as_me:$LINENO: checking __attribute__((unused))" >&5 -echo $ECHO_N "checking __attribute__((unused))... $ECHO_C" >&6 - if test "${dpkg_cv_c_attribute_unused+set}" = set; then +echo "$as_me:$LINENO: checking whether compiler supports __attribute__" >&5 +echo $ECHO_N "checking whether compiler supports __attribute__... $ECHO_C" >&6 +if test "${dpkg_cv_attribute+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9745,6 +14598,7 @@ int main () { extern int testfunction(int x) __attribute__((unused)) + ; return 0; } @@ -9770,561 +14624,395 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - dpkg_cv_c_attribute_unused=yes + dpkg_cv_attribute=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -dpkg_cv_c_attribute_unused=no +dpkg_cv_attribute=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "x$dpkg_cv_c_attribute_unused" = xyes; then - true - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +echo "$as_me:$LINENO: result: $dpkg_cv_attribute" >&5 +echo "${ECHO_T}$dpkg_cv_attribute" >&6 +if test "x$dpkg_cv_attribute" = "xyes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUC25_UNUSED +#define HAVE_C_ATTRIBUTE 1 _ACEOF +else + cat >>confdefs.h <<\_ACEOF +#define HAVE_C_ATTRIBUTE 0 +_ACEOF - else - true - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - - fi - - +fi - echo "$as_me:$LINENO: checking __attribute__((format...))" >&5 -echo $ECHO_N "checking __attribute__((format...))... $ECHO_C" >&6 - if test "${dpkg_cv_c_attribute_format+set}" = set; then +# Checks for library functions. +echo "$as_me:$LINENO: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${dpkg_cv_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ -extern int testfunction(char *y, ...) __attribute__((format(printf,1,2))) - ; - return 0; +#include +main() { +va_list v1, v2; +va_copy (v1, v2); +exit (0); } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - dpkg_cv_c_attribute_format=yes + dpkg_cv_va_copy=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -dpkg_cv_c_attribute_format=no +( exit $ac_status ) +dpkg_cv_va_copy=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - if test "x$dpkg_cv_c_attribute_format" = xyes; then - true - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +fi +echo "$as_me:$LINENO: result: $dpkg_cv_va_copy" >&5 +echo "${ECHO_T}$dpkg_cv_va_copy" >&6 +if test "x$dpkg_cv_va_copy" = "xyes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_GNUC25_PRINTFFORMAT +#define HAVE_VA_COPY 1 _ACEOF - - else - true - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - - fi - - - else - true - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - - fi - - - -echo "$as_me:$LINENO: checking whether to use -Werror" >&5 -echo $ECHO_N "checking whether to use -Werror... $ECHO_C" >&6 - -# Check whether --with-Werror or --without-Werror was given. -if test "${with_Werror+set}" = set; then - withval="$with_Werror" - warn=-Werror - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Werror" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Werror... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_warn_error+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if $CC -Werror -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_warn_error=yes - else - dpkg_cv_c_gcc_warn_error= - fi - -fi - - if test "x$dpkg_cv_c_gcc_warn_error" = xyes; then - CWARNS="${CWARNS} -Werror" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - -else - warn=all - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wall " >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wall ... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_warn_all+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if $CC -Wall -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_warn_all=yes - else - dpkg_cv_c_gcc_warn_all= - fi - -fi - - if test "x$dpkg_cv_c_gcc_warn_all" = xyes; then - CWARNS="${CWARNS} -Wall " - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wwrite-strings" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wwrite-strings... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_warn_writestrings+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if $CC -Wwrite-strings -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_warn_writestrings=yes - else - dpkg_cv_c_gcc_warn_writestrings= - fi - -fi - - if test "x$dpkg_cv_c_gcc_warn_writestrings" = xyes; then - CWARNS="${CWARNS} -Wwrite-strings" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wpointer-arith" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wpointer-arith... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_warn_pointerarith+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if $CC -Wpointer-arith -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_warn_pointerarith=yes - else - dpkg_cv_c_gcc_warn_pointerarith= - fi - -fi - - if test "x$dpkg_cv_c_gcc_warn_pointerarith" = xyes; then - CWARNS="${CWARNS} -Wpointer-arith" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wimplicit -Wnested-externs" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wimplicit -Wnested-externs... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_warn_implicit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if $CC -Wimplicit -Wnested-externs -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_warn_implicit=yes - else - dpkg_cv_c_gcc_warn_implicit= - fi - -fi - - if test "x$dpkg_cv_c_gcc_warn_implicit" = xyes; then - CWARNS="${CWARNS} -Wimplicit -Wnested-externs" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wstrict-prototypes" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wstrict-prototypes... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_strict_prototypes+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - - if $CC -Wstrict-prototypes -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_strict_prototypes=yes - else - dpkg_cv_c_gcc_strict_prototypes= - fi - -fi - - if test "x$dpkg_cv_c_gcc_strict_prototypes" = xyes; then - CWARNS="${CWARNS} -Wstrict-prototypes" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wmissing-prototypes" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wmissing-prototypes... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_missing_prototypes+set}" = set; then + echo "$as_me:$LINENO: checking for va_list assignment by copy" >&5 +echo $ECHO_N "checking for va_list assignment by copy... $ECHO_C" >&6 +if test "${dpkg_cv_va_list_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include - if $CC -Wmissing-prototypes -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_missing_prototypes=yes - else - dpkg_cv_c_gcc_missing_prototypes= - fi - -fi - - if test "x$dpkg_cv_c_gcc_missing_prototypes" = xyes; then - CWARNS="${CWARNS} -Wmissing-prototypes" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +int +main () +{ +va_list v1, v2; +v1 = v2; - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wmissing-declarations" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wmissing-declarations... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_missing_declarations+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + dpkg_cv_va_list_copy=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if $CC -Wmissing-declarations -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_missing_declarations=yes - else - dpkg_cv_c_gcc_missing_declarations= - fi - +dpkg_cv_va_list_copy=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $dpkg_cv_va_list_copy" >&5 +echo "${ECHO_T}$dpkg_cv_va_list_copy" >&6 fi - if test "x$dpkg_cv_c_gcc_missing_declarations" = xyes; then - CWARNS="${CWARNS} -Wmissing-declarations" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wbad-function-cast" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wbad-function-cast... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_func_cast+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if $CC -Wbad-function-cast -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_func_cast=yes - else - dpkg_cv_c_gcc_func_cast= - fi -fi - if test "x$dpkg_cv_c_gcc_func_cast" = xyes; then - CWARNS="${CWARNS} -Wbad-function-cast" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wcast-qual -Wcast-align" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wcast-qual -Wcast-align... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_cast_qual+set}" = set; then +for ac_func in vsnprintf snprintf strerror strsignal scandir alphasort +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func - if $CC -Wcast-qual -Wcast-align -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_cast_qual=yes - else - dpkg_cv_c_gcc_cast_qual= - fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -fi +#ifdef __STDC__ +# include +#else +# include +#endif - if test "x$dpkg_cv_c_gcc_cast_qual" = xyes; then - CWARNS="${CWARNS} -Wcast-qual -Wcast-align" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi +#undef $ac_func +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif - echo "$as_me:$LINENO: checking GCC warning flag(s) -Winline" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Winline... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if $CC -Winline -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_inline=yes - else - dpkg_cv_c_gcc_inline= - fi - +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - if test "x$dpkg_cv_c_gcc_inline" = xyes; then - CWARNS="${CWARNS} -Winline" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi +fi +done - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wmissing-noreturn" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wmissing-noreturn... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_noreturn+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if $CC -Wmissing-noreturn -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_noreturn=yes - else - dpkg_cv_c_gcc_noreturn= - fi -fi - if test "x$dpkg_cv_c_gcc_noreturn" = xyes; then - CWARNS="${CWARNS} -Wmissing-noreturn" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - echo "$as_me:$LINENO: checking GCC warning flag(s) -Wsign-compare" >&5 -echo $ECHO_N "checking GCC warning flag(s) -Wsign-compare... $ECHO_C" >&6 - if test "${GCC-no}" = yes - then - if test "${dpkg_cv_c_gcc_comp_conv+set}" = set; then +for ac_func in unsetenv lchown setsid bcopy isascii memcpy +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func - if $CC -Wsign-compare -c /dev/null 2>/dev/null; then - dpkg_cv_c_gcc_comp_conv=yes - else - dpkg_cv_c_gcc_comp_conv= - fi - -fi - - if test "x$dpkg_cv_c_gcc_comp_conv" = xyes; then - CWARNS="${CWARNS} -Wsign-compare" - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif -expandvar() { echo $(eval echo $1) ; } +#undef $ac_func -test "x$prefix" = xNONE && prefix="$ac_default_prefix" -test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" -LLIBDIR=`eval echo $libdir` -LLIBDIR=`eval echo $LLIBDIR` -LOCALSTATEDIR="$(expandvar $localstatedir)" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif -cat >>confdefs.h <<_ACEOF -#define LLIBDIR "$LLIBDIR" +int +main () +{ +return f != $ac_func; + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - -cat >>confdefs.h <<_ACEOF -#define LOCALSTATEDIR "$LOCALSTATEDIR" +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - -admindir=$(expandvar "$admindir") -bindir=$(expandvar "$bindir") -datadir=$(expandvar "$datadir") -includedirdir=$(expandvar "$includedirdir") -libdir=$(expandvar "$libdir") -libexecdir=$(expandvar "$libexecdir") -localstatedir=$(expandvar "$localstatedir") -mandir=$(expandvar "$mandir") -sbindir=$(expandvar "$sbindir") -sharedstatedir=$(expandvar "$sharedstatedir") -sysconfdir=$(expandvar "$sysconfdir") -infodir=$(expandvar "$infodir") - +fi +done +# Check whether --enable-compiler-warnings or --disable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then + enableval="$enable_compiler_warnings" + if test "x$enable_compiler_warnings" = "xyes"; then + if test "x$GCC" = "xyes"; then + CFLAGS="-Wall -Werror $CFLAGS" + fi + if test "x$GXX" = "xyes"; then + CXXFLAGS="-Wall -Werror $CXXFLAGS" + fi +fi +fi; +# Check whether --enable-compiler-optimisations or --disable-compiler-optimisations was given. +if test "${enable_compiler_optimisations+set}" = set; then + enableval="$enable_compiler_optimisations" + if test "x$enable_compiler_optimisations" = "xno"; then + CFLAGS=`echo "$CFLAGS" | sed -e "s/ -O[1-9]*\b/ -O0/g"` +fi +fi; +# Check whether --enable-linker-optimisations or --disable-linker-optimisations was given. +if test "${enable_linker_optimisations+set}" = set; then + enableval="$enable_linker_optimisations" + if test "x$enable_linker_optimisations" = "xno"; then + LDFLAGS=`echo "$LDFLAGS" | sed -e "s/ -Wl,-O[0-9]*\b//g"` +else + LDFLAGS="$LDFLAGS -Wl,-O1" +fi +else + LDFLAGS="$LDFLAGS -Wl,-O1" +fi; + ac_config_files="$ac_config_files Makefile dpkg-deb/Makefile dpkg-split/Makefile dselect/Makefile getopt/Makefile intl/Makefile lib/Makefile man/Makefile man/C/Makefile man/de/Makefile man/es/Makefile man/fr/Makefile man/ja/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile methods/Makefile origins/Makefile po/Makefile.in scripts/Makefile src/Makefile utils/Makefile" + ac_config_headers="$ac_config_headers config.h" - ac_config_files="$ac_config_files po/Makefile.in Makefile.conf Makefile include/Makefile dpkg-deb/Makefile split/Makefile lib/Makefile optlib/Makefile doc/Makefile man/Makefile man/paths.ent man/de/Makefile man/en/Makefile man/es/Makefile man/fr/Makefile man/ja/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile scripts/Makefile main/Makefile dselect/Makefile methods/Makefile utils/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -10416,10 +15104,45 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -if test -z "${HAVE_CPLUSPLUS_TRUE}" && test -z "${HAVE_CPLUSPLUS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_CPLUSPLUS\" was never defined. +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${WITH_DSELECT_TRUE}" && test -z "${WITH_DSELECT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_DSELECT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WITH_DSELECT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${WITH_START_STOP_DAEMON_TRUE}" && test -z "${WITH_START_STOP_DAEMON_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_START_STOP_DAEMON\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WITH_START_STOP_DAEMON\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_CPLUSPLUS\" was never defined. +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -10694,7 +15417,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by dpkg $as_me 1.13.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10757,7 +15480,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +dpkg config.status 1.13.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -10863,13 +15586,7 @@ cat >>$CONFIG_STATUS <<_ACEOF # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" -# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF @@ -10880,32 +15597,30 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "Makefile.conf" ) CONFIG_FILES="$CONFIG_FILES Makefile.conf" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "dpkg-deb/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpkg-deb/Makefile" ;; - "split/Makefile" ) CONFIG_FILES="$CONFIG_FILES split/Makefile" ;; + "dpkg-split/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpkg-split/Makefile" ;; + "dselect/Makefile" ) CONFIG_FILES="$CONFIG_FILES dselect/Makefile" ;; + "getopt/Makefile" ) CONFIG_FILES="$CONFIG_FILES getopt/Makefile" ;; + "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "optlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES optlib/Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "man/paths.ent" ) CONFIG_FILES="$CONFIG_FILES man/paths.ent" ;; + "man/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/C/Makefile" ;; "man/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/de/Makefile" ;; - "man/en/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/en/Makefile" ;; "man/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/es/Makefile" ;; "man/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/fr/Makefile" ;; "man/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/ja/Makefile" ;; "man/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/pt_BR/Makefile" ;; "man/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/ru/Makefile" ;; "man/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/sv/Makefile" ;; - "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "main/Makefile" ) CONFIG_FILES="$CONFIG_FILES main/Makefile" ;; - "dselect/Makefile" ) CONFIG_FILES="$CONFIG_FILES dselect/Makefile" ;; "methods/Makefile" ) CONFIG_FILES="$CONFIG_FILES methods/Makefile" ;; + "origins/Makefile" ) CONFIG_FILES="$CONFIG_FILES origins/Makefile" ;; + "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -10992,10 +15707,6 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@ALSO_STATIC@,$ALSO_STATIC,;t t -s,@DSELECTDIR@,$DSELECTDIR,;t t -s,@USE_START_STOP_DAEMON@,$USE_START_STOP_DAEMON,;t t -s,@USE_SGML_DOC@,$USE_SGML_DOC,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t @@ -11008,58 +15719,91 @@ 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,@CC@,$CC,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@HAVE_CPLUSPLUS_TRUE@,$HAVE_CPLUSPLUS_TRUE,;t t -s,@HAVE_CPLUSPLUS_FALSE@,$HAVE_CPLUSPLUS_FALSE,;t t -s,@LD@,$LD,;t t -s,@ac_ct_LD@,$ac_ct_LD,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@os_type@,$os_type,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@CYGPATH_W@,$CYGPATH_W,;t t +s,@PACKAGE@,$PACKAGE,;t t +s,@VERSION@,$VERSION,;t t +s,@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,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@mkdir_p@,$mkdir_p,;t t +s,@AWK@,$AWK,;t t +s,@SET_MAKE@,$SET_MAKE,;t t +s,@am__leading_dot@,$am__leading_dot,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t s,@MSGMERGE@,$MSGMERGE,;t t -s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@DEPDIR@,$DEPDIR,;t t +s,@am__include@,$am__include,;t t +s,@am__quote@,$am__quote,;t t +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +s,@CCDEPMODE@,$CCDEPMODE,;t t +s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t +s,@ALLOCA@,$ALLOCA,;t t +s,@GLIBC21@,$GLIBC21,;t t +s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t +s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t +s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t +s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t s,@LIBICONV@,$LIBICONV,;t t s,@LTLIBICONV@,$LTLIBICONV,;t t +s,@INTLBISON@,$INTLBISON,;t t +s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t +s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t +s,@CATOBJEXT@,$CATOBJEXT,;t t +s,@DATADIRNAME@,$DATADIRNAME,;t t +s,@INSTOBJEXT@,$INSTOBJEXT,;t t +s,@GENCAT@,$GENCAT,;t t +s,@INTLOBJS@,$INTLOBJS,;t t +s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t s,@INTLLIBS@,$INTLLIBS,;t t s,@LIBINTL@,$LIBINTL,;t t s,@LTLIBINTL@,$LTLIBINTL,;t t s,@POSUB@,$POSUB,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@LN_S@,$LN_S,;t t -s,@RM@,$RM,;t t -s,@SED@,$SED,;t t +s,@WITH_DSELECT_TRUE@,$WITH_DSELECT_TRUE,;t t +s,@WITH_DSELECT_FALSE@,$WITH_DSELECT_FALSE,;t t +s,@WITH_START_STOP_DAEMON_TRUE@,$WITH_START_STOP_DAEMON_TRUE,;t t +s,@WITH_START_STOP_DAEMON_FALSE@,$WITH_START_STOP_DAEMON_FALSE,;t t +s,@admindir@,$admindir,;t t +s,@CXX@,$CXX,;t t +s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@CXXDEPMODE@,$CXXDEPMODE,;t t +s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s,@PERL@,$PERL,;t t -s,@SSD_LIBS@,$SSD_LIBS,;t t -s,@CURSES_LIBS@,$CURSES_LIBS,;t t s,@ZLIB_CFLAGS@,$ZLIB_CFLAGS,;t t s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t -s,@ZLIB_LIBS_ALSO_STATIC@,$ZLIB_LIBS_ALSO_STATIC,;t t -s,@BZ2LIB_CFLAGS@,$BZ2LIB_CFLAGS,;t t -s,@BZ2LIB_LIBS@,$BZ2LIB_LIBS,;t t -s,@BZ2LIB_LIBS_ALSO_STATIC@,$BZ2LIB_LIBS_ALSO_STATIC,;t t -s,@CWARNS@,$CWARNS,;t t -s,@admindir@,$admindir,;t t +s,@BZ2_CFLAGS@,$BZ2_CFLAGS,;t t +s,@BZ2_LIBS@,$BZ2_LIBS,;t t +s,@CURSES_LIBS@,$CURSES_LIBS,;t t +s,@SSD_LIBS@,$SSD_LIBS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -11522,6 +16266,28 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} cat $tmp/config.h rm -f $tmp/config.h fi +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -11747,115 +16513,97 @@ echo "$as_me: executing $ac_dest commands" >&6;} ;; esac done ;; - default-2 ) - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done ;; + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //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 ' + /^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=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; esac done _ACEOF @@ -11888,4 +16636,3 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi - diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..cc08a7b0 --- /dev/null +++ b/configure.ac @@ -0,0 +1,123 @@ +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.59) +AC_INIT([dpkg], [1.13.1], [debian-dpkg@lists.debian.org]) +AC_CONFIG_SRCDIR([lib/dpkg.h]) +AC_CONFIG_MACRO_DIR([m4]) + +AC_CANONICAL_SYSTEM +AC_GNU_SOURCE + +AM_INIT_AUTOMAKE([1.8 gnu]) + +AM_GNU_GETTEXT_VERSION(0.14.1) +AM_GNU_GETTEXT() + +# Allow compilation without dselect +AC_ARG_WITH(dselect, + AS_HELP_STRING([--without-dselect], + [don't build dselect package-management frontend]), + [build_dselect=$with_dselect], + [build_dselect=yes]) +AM_CONDITIONAL(WITH_DSELECT, [test "x$build_dselect" = "xyes"]) + +# Allow compilation without start-stop-daemon +AC_ARG_WITH(start-stop-daemon, + AS_HELP_STRING([--without-start-stop-daemon], + [don't build or use start-stop-daemon]), + [build_start_stop_daemon=$with_start_stop_daemon], + [build_start_stop_daemon=yes]) +AM_CONDITIONAL(WITH_START_STOP_DAEMON, + [test "x$build_start_stop_daemon" = "xyes"]) +if test "x$build_start_stop_daemon" = "xyes"; then + AC_DEFINE(WITH_START_STOP_DAEMON, 1, + [Define to 1 if start-stop-daemon is compiled.]) +else + AC_DEFINE(WITH_START_STOP_DAEMON, 0) +fi + +# Allow alternate admin directory +admindir="${localstatedir}/${PACKAGE_NAME}" +AC_ARG_WITH(admindir, + AS_HELP_STRING([--with-admindir=DIR], + [dpkg database directory [[LOCALSTATEDIR/dpkg]]]), +[case "$with_admindir" in + "") AC_MSG_ERROR([invalid admindir specified]) ;; + *) admindir="$with_admindir" ;; +esac]) +AC_SUBST(admindir) + + +# Checks for programs. +AC_PROG_CC +AC_PROG_CXX +AC_PROG_RANLIB +DPKG_PROG_PERL + +# Checks for operating system services and capabilities. +AC_SYS_LARGEFILE +DPKG_ARCHITECTURE + +# Checks for libraries. +DPKG_LIB_ZLIB +DPKG_LIB_BZ2 +if test "x$build_dselect" = "xyes"; then + DPKG_LIB_CURSES +fi +if test "x$build_start_stop_daemon" = "xyes"; then + DPKG_LIB_SSD +fi + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([error.h sys/cdefs.h kvm.h]) +DPKG_CHECK_DEFINE(TIOCNOTTY, [sys/ioctl.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN +AC_C_CONST +AC_C_INLINE +AC_C_VOLATILE +DPKG_C_C99 +AC_TYPE_MODE_T +AC_TYPE_PID_T +AC_TYPE_SIZE_T +DPKG_TYPE_PTRDIFF_T +AC_CHECK_SIZEOF(unsigned int) +AC_CHECK_SIZEOF(unsigned long) +DPKG_DECL_SYS_SIGLIST +DPKG_C_ATTRIBUTE + +# Checks for library functions. +DPKG_FUNC_VA_COPY +AC_CHECK_FUNCS([vsnprintf snprintf strerror strsignal scandir alphasort]) +AC_CHECK_FUNCS([unsetenv lchown setsid bcopy isascii memcpy]) + +SJR_COMPILER_WARNINGS +SJR_COMPILER_OPTIMISATIONS +SJR_LINKER_OPTIMISATIONS + +AC_CONFIG_FILES([ Makefile + dpkg-deb/Makefile + dpkg-split/Makefile + dselect/Makefile + getopt/Makefile + intl/Makefile + lib/Makefile + man/Makefile + man/C/Makefile + man/de/Makefile + man/es/Makefile + man/fr/Makefile + man/ja/Makefile + man/pt_BR/Makefile + man/ru/Makefile + man/sv/Makefile + methods/Makefile + origins/Makefile + po/Makefile.in + scripts/Makefile + src/Makefile + utils/Makefile ]) +AC_CONFIG_HEADERS([config.h]) +AC_OUTPUT \ No newline at end of file diff --git a/configure.in b/configure.in deleted file mode 100644 index 3ffe37b8..00000000 --- a/configure.in +++ /dev/null @@ -1,513 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.53]) - -AC_INIT(include/dpkg.h.in) -AC_CONFIG_HEADER(config.h) - -ALSO_STATIC= -AC_ARG_WITH(static-progs, -[ --with-static-progs compile static versions of certain binaries as well], -[case "$withval" in - "true" | "yes" ) - ALSO_STATIC=1 - ;; - esac]) -AC_SUBST(ALSO_STATIC) - -DSELECTDIR="dselect" -AC_ARG_WITH(dselect, -[ --with-dselect the dselect package-management frontend], -[case "$withval" in - "false" | "no" ) - DSELECTDIR="" - ;; - esac]) -AC_SUBST(DSELECTDIR) - -USE_START_STOP_DAEMON="true" -AC_ARG_WITH(start-stop-daemon, -[ --with-start-stop-daemon - start and stop system daemons], -[case "$withval" in - "false" | "no" ) - USE_START_STOP_DAEMON="" - ;; - esac]) -AC_SUBST(USE_START_STOP_DAEMON) -if test "$USE_START_STOP_DAEMON" != ""; then - AC_DEFINE(USE_START_STOP_DAEMON,,[Define if start-stop-daemon is compiled.]) -fi - -USE_SGML_DOC="true" -AC_ARG_WITH(sgml-doc, -[ --with-sgml-doc SGML documentation converted to HTML], -[case "$withval" in - "false" | "no" ) - USE_SGML_DOC="" - ;; - esac]) -AC_SUBST(USE_SGML_DOC) - -admindir="$libdir/db" -AC_ARG_WITH(admindir, -[ --with-admindir=DIR store dpkg database in DIR [LIBDIR/db]], -[case "$withval" in - "" ) - AC_MSG_ERROR(invalid admindir specified) - ;; - * ) - admindir="$withval" - ;; - esac]) - - -AC_CHECK_TOOL_PREFIX -AC_CANONICAL_SYSTEM - -AC_CHECK_TOOL(CC, gcc) -AC_PROG_CC -AC_PROG_CXX -AM_CONDITIONAL(HAVE_CPLUSPLUS, [test "$CXX" != ""]) - -AC_CHECK_TOOL(LD, ld, ld) - -PACKAGE=dpkg -AC_SUBST(PACKAGE) -VERSION=`cat $srcdir/version-nr` -AC_SUBST(VERSION) - -AC_SYS_LARGEFILE - -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]) -fi -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]) -AC_ARG_PROGRAM -AC_PROG_MAKE_SET - -AC_MSG_CHECKING(dpkg version) -AC_MSG_RESULT($VERSION) - -AC_PREFIX_DEFAULT(/usr) - -# OpenBSD has decided to be odd and includ a version number -# in the final field of the GNU system type. -# This code strips it out in a generic way. -os_type='' -AC_MSG_CHECKING(Operating system type) -case $target_os in - *linux-gnu* ) - os_type="linux-gnu";; - *linux* ) - os_type="linux-gnu";; - *openbsd* ) - os_type="openbsd";; - *knetbsd*-gnu* ) - os_type="knetbsd-gnu";; - *netbsd* ) - os_type="netbsd";; - *kfreebsd*-gnu* ) - os_type="kfreebsd-gnu";; - *freebsd* ) - os_type="freebsd";; - gnu ) - os_type="hurd";; -esac -if test "x$os_type" = "x"; then - os_type=$target_os -fi -AC_MSG_RESULT([$os_type]) -AC_SUBST(os_type) - -dpkg_archset='' -AC_MSG_CHECKING(Debian architecture) -dpkg_archset="`awk '$1 == "'$target_cpu-$os_type'" { print $2 }' $srcdir/archtable`" -# Finish off -if test "x$dpkg_archset" = "x"; then - AC_MSG_RESULT([$target_cpu-$os_type, but not found in archtable]) - dpkg_archset=$target_cpu-$os_type - else - AC_MSG_RESULT($dpkg_archset) -fi -AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", [Set this to the canonical Debian architecture string for this CPU type.]) - -dnl gettext - -ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ro ru sk sv tl zh_CN zh_TW" -AM_GNU_GETTEXT([external]) -AM_PO_SUBDIRS -if test "x$HAVE_LOCALE_H" = "x"; then - AC_MSG_CHECKING([whether setlocale() is available]) - HAVE_SETLOCALE='' - AC_TRY_COMPILE([#include ],[ setlocale(0, "bar");], HAVE_SETLOCALE=1; - AC_DEFINE(HAVE_SETLOCALE,1,[Define if setlocale is available.]) - ) - if test "x$HAVE_SETLOCALE" = x; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - fi -fi - -dnl Other stuff - -AC_STDC_HEADERS -AC_PROG_RANLIB -AC_PROG_LN_S -AC_CHECK_PROG(RM,rm,rm -f) -AC_CHECK_PROG(SED,sed,sed) -AC_PROG_INSTALL -AC_PATH_PROG(PERL,perl,/usr/bin/perl) -AC_MODE_T -AC_PID_T -AC_SIZE_T -AC_VPRINTF -AC_C_CONST -AC_C_BIGENDIAN -AC_C_INLINE -AC_CHECK_SIZEOF(unsigned long) -AC_CHECK_SIZEOF(unsigned int) -AC_CHECK_TYPE(ptrdiff_t,int) -AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul setsid) -AC_CHECK_FUNCS(vsnprintf lchown snprintf) -AC_CHECK_HEADERS(sys/cdefs.h syslog.h stddef.h) -AC_CHECK_HEADERS(error.h locale.h) -AC_DECL_SYS_SIGLIST -AC_CHECK_LIB(ihash, ihash_create, SSD_LIBS="-lihash $SSD_LIBS") -AC_CHECK_LIB(ps, proc_stat_list_create, SSD_LIBS="-lps $SSD_LIBS") -AC_CHECK_LIB(shouldbeinlibc, fmt_past_time, SSD_LIBS="-lshouldbeinlibc $SSD_LIBS") -AC_CHECK_LIB(kvm, kvm_openfiles, SSD_LIBS="-lkvm $SSD_LIBS") -AC_SUBST(SSD_LIBS) - -# check for the proper curses library. This can be either -# -lcurses or -lncurses, we need to check for either one. -AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS")) -if test "x$CURSES_LIBS" = "x"; then - AC_MSG_WARN(no curses library found) -fi -AC_SUBST(CURSES_LIBS) - -DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h) - -ZLIB_CFLAGS= -ZLIB_LIBS= -ZLIB_LIBS_ALSO_STATIC= -AC_ARG_WITH(zlib, -[ --with-zlib use zlib for decompression of some gzip files], - [use_zlib=$withval], - [uze_zlib=no]) -if test "$use_zlib" != "no" ; then - ZLIB_CFLAGS=-DUSE_ZLIB - if test "$use_zlib" = "static" ; then - ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic" - if test "$ALSO_STATIC"; then - ZLIB_LIBS_ALSO_STATIC="-lz" - fi - else - ZLIB_LIBS=-lz - ZLIB_LIBS_ALSO_STATIC="-lz" - fi -fi -AC_SUBST(ZLIB_CFLAGS) -AC_SUBST(ZLIB_LIBS) -AC_SUBST(ZLIB_LIBS_ALSO_STATIC) - -BZ2LIB_CFLAGS= -BZ2LIB_LIBS= -BZ2LIB_LIBS_ALSO_STATIC= -AC_ARG_WITH(bz2lib, -[ --with-bz2lib use bz2lib for decompression of some bzip2 files], - [use_bz2lib=$withval], - [uze_bz2lib=no]) -if test "$use_bz2lib" != "no" ; then - BZ2LIB_CFLAGS=-DUSE_BZ2LIB - if test "$use_bz2lib" = "static" ; then - BZ2LIB_LIBS="-Wl,-Bstatic -lbz2 -Wl,-Bdynamic" - if test "$ALSO_STATIC"; then - BZ2LIB_LIBS_ALSO_STATIC="-lbz2" - fi - else - BZ2LIB_LIBS=-lbz2 - BZ2LIB_LIBS_ALSO_STATIC="-lbz2" - fi -fi -AC_SUBST(BZ2LIB_CFLAGS) -AC_SUBST(BZ2LIB_LIBS) -AC_SUBST(BZ2LIB_LIBS_ALSO_STATIC) - -AC_TRY_COMPILE([ -#include -#include -], alphasort, AC_DEFINE(HAVE_ALPHASORT_DECLARATION,,[Define if alphasort is declared.])) - -AC_TRY_COMPILE(,[ -} inline int foo (int x) {], AC_DEFINE(HAVE_INLINE,,[Define if inline functions a la GCC are available.])) - -AC_MSG_CHECKING([for va_copy]) -# OpenBSD passes AC_TRY_COMPILE for va_copy even though -# it doesn't seem to exist, which is odd. We need to use -# AC_TRY_RUN. -AC_TRY_RUN([ -#include -main(){ -va_list v1,v2; -va_copy(v1, v2); -exit(0);} -], [AC_MSG_RESULT(yes) -AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no) -AC_MSG_CHECKING([for va_list assignment copy]) -AC_TRY_COMPILE([ -#include -],[ -va_list v1,v2; -v1 = v2; -], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))]) - -DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.], - DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.]) - DPKG_C_GCC_ATTRIBUTE(const,const,[int x],const,CONST,[Define if constant functions a la GCC 2.5 and higher are available.]) - DPKG_C_GCC_ATTRIBUTE(unused,unused,[int x],unused,UNUSED,[Define if unused variables la GCC 2.5 and higher are available.]) - DPKG_C_GCC_ATTRIBUTE(format...,format,[char *y, ...],[format(printf,1,2)],PRINTFFORMAT,[Define if printf-format argument lists a la GCC are available.])) - -AC_MSG_CHECKING(whether to use -Werror) -AC_ARG_WITH(Werror, -[ --with-Werror use -Werror when compiling], - [warn=-Werror] - AC_MSG_RESULT(yes) - DPKG_C_GCC_TRY_WARNS(-Werror, dpkg_cv_c_gcc_warn_error), - [warn=all] - AC_MSG_RESULT(no)) - -DPKG_C_GCC_TRY_WARNS(-Wall , dpkg_cv_c_gcc_warn_all) -DPKG_C_GCC_TRY_WARNS(-Wwrite-strings, dpkg_cv_c_gcc_warn_writestrings) -DPKG_C_GCC_TRY_WARNS(-Wpointer-arith, dpkg_cv_c_gcc_warn_pointerarith) -DPKG_C_GCC_TRY_WARNS(-Wimplicit -Wnested-externs, dpkg_cv_c_gcc_warn_implicit) -DPKG_C_GCC_TRY_WARNS(-Wstrict-prototypes, dpkg_cv_c_gcc_strict_prototypes) -DPKG_C_GCC_TRY_WARNS(-Wmissing-prototypes, dpkg_cv_c_gcc_missing_prototypes) -DPKG_C_GCC_TRY_WARNS(-Wmissing-declarations, dpkg_cv_c_gcc_missing_declarations) -DPKG_C_GCC_TRY_WARNS(-Wbad-function-cast, dpkg_cv_c_gcc_func_cast) -DPKG_C_GCC_TRY_WARNS(-Wcast-qual -Wcast-align, dpkg_cv_c_gcc_cast_qual) -DPKG_C_GCC_TRY_WARNS(-Winline, dpkg_cv_c_gcc_inline) -DPKG_C_GCC_TRY_WARNS(-Wmissing-noreturn, dpkg_cv_c_gcc_noreturn) -DPKG_C_GCC_TRY_WARNS(-Wsign-compare, dpkg_cv_c_gcc_comp_conv) -AC_SUBST(CWARNS) - -dnl fix up patchs. We can not use variable references paths since -dnl that breaks DocBook -expandvar() { echo $(eval echo $1) ; } - -test "x$prefix" = xNONE && prefix="$ac_default_prefix" -test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" -LLIBDIR=`eval echo $libdir` -LLIBDIR=`eval echo $LLIBDIR` -LOCALSTATEDIR="$(expandvar $localstatedir)" -AC_DEFINE_UNQUOTED(LLIBDIR, "$LLIBDIR", [Defined to the $(libdir) location]) -AC_DEFINE_UNQUOTED(LOCALSTATEDIR, "$LOCALSTATEDIR", [Defined to $(localstatedir) dir location]) - -admindir=$(expandvar "$admindir") -bindir=$(expandvar "$bindir") -datadir=$(expandvar "$datadir") -includedirdir=$(expandvar "$includedirdir") -libdir=$(expandvar "$libdir") -libexecdir=$(expandvar "$libexecdir") -localstatedir=$(expandvar "$localstatedir") -mandir=$(expandvar "$mandir") -sbindir=$(expandvar "$sbindir") -sharedstatedir=$(expandvar "$sharedstatedir") -sysconfdir=$(expandvar "$sysconfdir") -infodir=$(expandvar "$infodir") - -AC_SUBST(admindir) - -AH_BOTTOM([#ifdef HAVE_SYS_CDEFS_H -#include -#endif - -#ifdef HAVE_STDDEF_H -#include -#endif - -/* Use the definitions: */ - -/* Give us an unsigned 32-bit data type. */ -#if SIZEOF_UNSIGNED_LONG==4 -#define UWORD32 unsigned long -#elif SIZEOF_UNSIGNED_INT==4 -#define UWORD32 unsigned int -#else -#error I do not know what to use for a UWORD32. -#endif - -/* The maximum length of a #! interpreter displayed by dpkg-deb. */ -#ifdef PATH_MAX -#define INTERPRETER_MAX PATH_MAX -#else -#define INTERPRETER_MAX 1024 -#endif - -/* GNU C attributes. */ -#ifndef FUNCATTR -#ifdef HAVE_GNUC25_ATTRIB -#define FUNCATTR(x) __attribute__(x) -#else -#define FUNCATTR(x) -#endif -#endif - -/* GNU C printf formats, or null. */ -#ifndef ATTRPRINTF -#ifdef HAVE_GNUC25_PRINTFFORMAT -#define ATTRPRINTF(si,tc) format(printf,si,tc) -#else -#define ATTRPRINTF(si,tc) -#endif -#endif -#ifndef PRINTFFORMAT -#define PRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc))) -#endif - -/* GNU C nonreturning functions, or null. */ -#ifndef ATTRNORETURN -#ifdef HAVE_GNUC25_NORETURN -#define ATTRNORETURN noreturn -#else /* ! HAVE_GNUC25_NORETURN */ -#define ATTRNORETURN -#endif /* HAVE_GNUC25_NORETURN */ -#endif /* ATTRNORETURN */ - -#ifndef NONRETURNING -#define NONRETURNING FUNCATTR((ATTRNORETURN)) -#endif /* NONRETURNING */ - -/* Combination of both the above. */ -#ifndef NONRETURNPRINTFFORMAT -#define NONRETURNPRINTFFORMAT(si,tc) FUNCATTR((ATTRPRINTF(si,tc),ATTRNORETURN)) -#endif - -/* GNU C constant functions, or null. */ -#ifndef ATTRCONST -#ifdef HAVE_GNUC25_CONST -#define ATTRCONST const -#else -#define ATTRCONST -#endif -#endif -#ifndef CONSTANT -#define CONSTANT FUNCATTR((ATTRCONST)) -#endif - -/* GNU C unused functions, or null. */ -#ifndef ATTRUNUSED -#ifdef HAVE_GNUC25_UNUSED -#define ATTRUNUSED -#else -#define ATTRUNUSED -#endif -#endif -#ifndef UNUSED -#define UNUSED FUNCATTR((ATTRUNUSED)) -#endif - -/* Declare strerror if we don't have it already. */ -#ifndef HAVE_STRERROR -const char *strerror(int); -#endif - -/* Declare strsignal if we don't have it already. */ -#ifndef HAVE_STRSIGNAL -const char *strsignal(int); -#endif - -/* Declare scandir if we don't have it already. */ -#ifndef HAVE_SCANDIR -struct dirent; -int scandir(const char *dir, struct dirent ***namelist, - int (*select)(const struct dirent *), - int (*compar)(const void*, const void*)); -#endif - -/* Declare alphasort if we don't have it already. */ -#if !defined(HAVE_ALPHASORT) || !defined(HAVE_ALPHASORT_DECLARATION) -struct dirent; -int alphasort(const struct dirent *a, const struct dirent *b); -#endif - -/* Declare unsetenv if we don't have it already. */ -#ifndef HAVE_UNSETENV -void unsetenv(const char *x); -#endif - -/* Define strtoul if we don't have it already. */ -#ifndef HAVE_STRTOUL -#define strtoul strtol -#endif - -#ifndef HAVE_VA_COPY -#define va_copy(dest,src) (dest) = (src) -#endif - -/* Define WCOREDUMP if we don't have it already - coredumps won't be - * detected, though. - */ -#ifndef WCOREDUMP -#define WCOREDUMP(x) 0 -#endif - -/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default. - */ -#ifndef BUILDOLDPKGFORMAT -#define BUILDOLDPKGFORMAT 0 -#endif - -/* Take care of NLS matters. */ - -#if HAVE_LOCALE_H -# include -#endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) /* empty */ -#endif - -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -# define N_(Text) Text -#else -# undef bindtextdomain -# define bindtextdomain(Domain, Directory) /* empty */ -# undef textdomain -# define textdomain(Domain) /* empty */ -# define _(Text) Text -# define N_(Text) Text -# define gettext(Text) Text -#endif - -]) - -AC_OUTPUT( po/Makefile.in -Makefile.conf -Makefile -include/Makefile -dpkg-deb/Makefile -split/Makefile -lib/Makefile -optlib/Makefile -doc/Makefile -man/Makefile -man/paths.ent -man/de/Makefile -man/en/Makefile -man/es/Makefile -man/fr/Makefile -man/ja/Makefile -man/pt_BR/Makefile -man/ru/Makefile -man/sv/Makefile -scripts/Makefile -main/Makefile -dselect/Makefile -methods/Makefile -utils/Makefile) diff --git a/debian/README.compile b/debian/README.compile deleted file mode 100644 index 8854d620..00000000 --- a/debian/README.compile +++ /dev/null @@ -1,16 +0,0 @@ -To compile this package you need to have some less-then-standard packages -installed. Here's a list: - -perl -debiandoc-sgml -dpkg-perl -libpaperg -lout -psutils -sgml-base -sgml-data -sgml-tools -sgmlspm -sp -tetex-base -tetex-bin diff --git a/debian/changelog b/debian/changelog index 41abf50f..5f618e88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,64 @@ -dpkg (1.10.28) unstable; urgency=low +dpkg (1.13.1.0.1) experimental; urgency=low + + * Bin-MU; recompile against Debian unstable, to make dselect actually + installable. + + -- Scott James Remnant Fri, 11 Mar 2005 09:00:14 +0000 + +dpkg (1.13.1) experimental; urgency=low - The "Awh, yeah? Ripper!" Release. + The "Livin' like a good boy oughta" Release. + + * Removed dpkg --print-gnu-build-architecture option. Use variables + defined by dpkg-architecture instead. + * Soft-deprecated dpkg --print-installation-architecture. Use + dpkg --print-architecture instead, which now does the same thing. + * Removed third field from /usr/share/dpkg/archtable. + + * Now we no-longer pre-depend on dselect, check the upgrade will work + in preinst and give the user a chance to abort if they haven't yet + installed dselect and need to. Closes: #282335. + * Fix handling of GNU longname and longlink when a tarfile entry has + both. Closes: #128388. + * md5sum no longer outputs "-" when no argument is supplied. + Closes: #164591, #164889. + * Add darcs metadirectory to dpkg-source diff ignore list. Closes: #289760. + * Add new '-f' short option to dpkg-query as equivalent to --show-format. + Closes: #281627. + * Report conffile conflicts and per-package errors on the status-fd. + Closes: #297880. + * Correct typo in dpkg-architecture. Closes: #282701. + * Fix start-stop-daemon's support for GNU/kFreeBSD. Closes: #258051. - * New Translations (Christian Perrier): - - Romanian (Eddy Petrisor). Closes: #309714. - - Tagalog (Eric Pareja). Closes: #296407. + * Architecture Support: + - Added kfreebsd-amd64. Closes: #280693. + - Added m32r. Closes: #280710. + - Clean up of archtable. Closes: #118910, #286898. + - Clean up of dpkg-architecture. Closes: #256323. * Updated Translations (Christian Perrier): - - French (Christian Perrier). - - Greek (Konstantinos Margaritis). Closes: #295922 - - Indonesian (Arief S Fitrianto). Closes: #296733 - * Updated Manpage Translations (Christian Perrier): - - French (Philippe Batailler). - - Syntax error corrected in Brazilian Portuguese man page for - update-alternatives. Closes: #300646 + - French (French Team). + - Greek (Konstantinos Margaritis). Closes: #295922. + + -- Scott James Remnant Thu, 3 Mar 2005 12:09:07 +0000 - -- Scott James Remnant Thu, 26 May 2005 18:18:10 +0100 +dpkg (1.13.0) experimental; urgency=low + + The "Three banana strategy" Release. + + * Remove the /usr/info or /usr/info/dir symlinks we used to create. + Closes: #206063, #288415. + * Fix cast in lvalue assignment that gcc 4.0 doesn't like. + Closes: #282669, #284797. + * Correct bashism in disk method update script. Closes: #260568. + + * Scorched-earth reimplementation of the build process and control files + with debhelper and automake. Closes: #217946, #229629, #260568, #266995, + #283640, #292973, #293041. + * Remove SGML and POD documentation formats due to both licensing and + sanity issues. Closes: #285086. + * The dpkg-doc and dpkg-static packages are no more. + + -- Scott James Remnant Fri, 14 Jan 2005 19:28:00 +0000 dpkg (1.10.27) unstable; urgency=low @@ -22,7 +66,7 @@ dpkg (1.10.27) unstable; urgency=low * New Translations (Christian Perrier): - Indonesian (Arief S Fitrianto). - - Norwegian Bokmal (Bjorn Steensrud). + - Norwegian BokmÃ¥l (Bjorn Steensrud). * Updated Translations (Christian Perrier): - Dutch (confusing option corrected by Christian Perrier). - Galician (Jacobo Tarrio). diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index 599edd62..15f47fcb 100644 --- a/debian/control +++ b/debian/control @@ -5,52 +5,29 @@ Maintainer: Dpkg Development Uploaders: Scott James Remnant Origin: debian Bugs: debbugs://bugs.debian.org -Standards-Version: 3.5.8 -Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, autotools-dev +Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev Package: dpkg Architecture: any Essential: yes -Pre-Depends: dselect, ${shlibs:Pre-Depends} +Pre-Depends: ${shlibs:Depends} Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.10) Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3) +Suggests: apt Description: Package maintenance system for Debian - This package contains the programs which handle the installation and - removal of packages on your system. - . - The primary interface for the dpkg suite is the `dselect' program; - a more low-level and less user-friendly interface is available in - the form of the `dpkg' command. - . - In order to unpack and build Debian source packages you will need to - install the developers' package `dpkg-dev' as well as this one. - -Package: dpkg-static -Architecture: any -Priority: optional -Pre-Depends: dselect, ${shlibs:Pre-Depends} -Replaces: dpkg-doc-ja, dpkg, manpages-de (<= 0.4-3) -Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg, dpkg-dev (<< 1.10) -Provides: dpkg -Description: Package maintenance system for Debian (static compile) - This package contains the programs which handle the installation and - removal of packages on your system. - . - The primary interface for the dpkg suite is the `dselect' program; - a more low-level and less user-friendly interface is available in - the form of the `dpkg' command. + This package contains the low-level commands for handling the installation + and removal of packages on your system. . In order to unpack and build Debian source packages you will need to install the developers' package `dpkg-dev' as well as this one. - . - This version has a dpkg binary that is linked statically. Package: dpkg-dev Section: utils Priority: standard Architecture: all -Depends: perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils -Recommends: c-compiler +Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils +Recommends: gcc | c-compiler Suggests: gnupg, debian-keyring Conflicts: dpkgname Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja @@ -61,22 +38,13 @@ Description: Package building tools for Debian Most Debian source packages will require additional tools to build - for example, most packages need the `make' and the C compiler `gcc'. -Package: dpkg-doc -Section: doc -Priority: optional -Architecture: all -Replaces: dpkg-dev (<<1.4.1.19) -Description: Dpkg Internals Documentation - This document describes the internal operations of the dpkg program. It - covers building as well as the internals functions. If you are interested - in creating your own packages, then you may be more interested in the - debian-policy package. - Package: dselect Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, dpkg (>= 1.13.1) Replaces: dpkg (<< 1.10.3) Description: a user tool to manage Debian packages - dselect is the primary user interface for installing, removing and - managing Debian packages. It is a front-end to dpkg. - + dselect is an interface for managing the installation and removal of + packages on your system. + . + Many users find dselect intimidating and new users may prefer to use + `apt'-based user interfaces. diff --git a/debian/copyright b/debian/copyright index 3ee6df98..3781b4be 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,46 +1,54 @@ This is Debian's package maintenance system. -To build your own packages install the `dpkg-dev' package and read the -manuals which it installs in /usr/share/doc/dpkg and look at the `hello' -example package. - - -Copyright (C) 2004 Scott James Remnant -Copyright (C) 1994-1999 Ian Jackson -Copyright (C) 1999 Richard Kettlewell -Copyright (C) 1999-2002 Wichert Akkerman -Copyright (C) 1999 Ben Collins -Copyright (C) 1997-1998 Juho Vuori -Copyright (C) 1998 Nils Rennebarth -Copyright (C) 1996,1998 Miquel van Smoorenburg -Copyright (C) 1998 Juan Cespedes -Copyright (C) 1998 Jim Van Zandt -copyright (C) 1997 Charles Briscoe-Smith -Copyright (C) 1995,1996 Erick Branderhorst -Copyright (C) 1996 Kim-Minh Kaplan -Copyright (C) 1996 Michael Shields -Copyright (C) 1995 Bruce Perens -Copyright (C) 1994 Carl Streeter -Copyright (C) 1994 Matt Welsh -Copyright (C) 1994 Ian Murdock -Parts written by Colin Plumb and Branko Lankester in 1993. - - -This 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 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 with -your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with -the dpkg source package as the file COPYING. If not, write to the Free -Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +Copyright © 2004-2005 Scott James Remnant +Copyright © 2004-2005 Canonical Ltd. +Copyright © 1999-2002 Wichert Akkerman +Copyright © 1999-2001 Marcus Brinkmann +Copyright © 2001 Joey Hess +Copyright © 1994-1999 Ian Jackson +Copyright © 1999 Richard Kettlewell +Copyright © 1999 Ben Collins +Copyright © 1999 Roderick Shertler +Copyright © 1996-1998 Miquel van Smoorenburg +Copyright © 1997-1998 Juho Vuori +Copyright © 1997-1998 Charles Briscoe-Smith +Copyright © 1998 Nils Rennebarth +Copyright © 1998 Juan Cespedes +Copyright © 1998 Jim Van Zandt +Copyright © 1998 Koichi Sekido +Copyright © 1995-1996 Erick Branderhorst +Copyright © 1996 Kim-Minh Kaplan +Copyright © 1996 Klee Dienes +Copyright © 1996 Michael Shields +Copyright © 1995 Bruce Perens +Copyright © 1994 Carl Streeter +Copyright © 1994 Matt Welsh +Copyright © 1994 Ian Murdock + +Includes public domain MD5 code: + lib/md5.c and lib/md5.h originally written by Colin Plumb, + utils/md5sum.c originally written by Branko Lankester. + +Includes code from ‘getopt’ and ‘gettext’: + Copyright © 1984-2002 Free Software Foundation, Inc. + + +Licence: + +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. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg +source as the file ‘COPYING’ + /usr/bin/md5sum is compiled from md5.[ch] (written by Colin Plumb in 1993 and modified by Ian Jackson in 1995) and md5sum.c (written by diff --git a/debian/dpkg-dev.conffiles b/debian/dpkg-dev.conffiles deleted file mode 100644 index 42862ad8..00000000 --- a/debian/dpkg-dev.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/dpkg/shlibs.default -/etc/dpkg/shlibs.override diff --git a/debian/dpkg-dev.install b/debian/dpkg-dev.install new file mode 100644 index 00000000..6918c76e --- /dev/null +++ b/debian/dpkg-dev.install @@ -0,0 +1,50 @@ +../shlibs.default etc/dpkg +../shlibs.override etc/dpkg + +usr/bin/822-date +usr/bin/dpkg-architecture +usr/bin/dpkg-buildpackage +usr/bin/dpkg-checkbuilddeps +usr/bin/dpkg-distaddfile +usr/bin/dpkg-genchanges +usr/bin/dpkg-gencontrol +usr/bin/dpkg-name +usr/bin/dpkg-parsechangelog +usr/bin/dpkg-scanpackages +usr/bin/dpkg-scansources +usr/bin/dpkg-shlibdeps +usr/bin/dpkg-source +usr/lib/dpkg/controllib.pl +usr/lib/dpkg/parsechangelog +usr/share/man/*/*/822-date.1 +usr/share/man/*/822-date.1 +usr/share/man/*/*/deb-control.5 +usr/share/man/*/deb-control.5 +usr/share/man/*/*/deb-old.5 +usr/share/man/*/deb-old.5 +usr/share/man/*/*/deb.5 +usr/share/man/*/deb.5 +usr/share/man/*/*/dpkg-architecture.1 +usr/share/man/*/dpkg-architecture.1 +usr/share/man/*/*/dpkg-buildpackage.1 +usr/share/man/*/dpkg-buildpackage.1 +usr/share/man/*/*/dpkg-checkbuilddeps.1 +usr/share/man/*/dpkg-checkbuilddeps.1 +usr/share/man/*/*/dpkg-distaddfile.1 +usr/share/man/*/dpkg-distaddfile.1 +usr/share/man/*/*/dpkg-genchanges.1 +usr/share/man/*/dpkg-genchanges.1 +usr/share/man/*/*/dpkg-gencontrol.1 +usr/share/man/*/dpkg-gencontrol.1 +usr/share/man/*/*/dpkg-name.1 +usr/share/man/*/dpkg-name.1 +usr/share/man/*/*/dpkg-parsechangelog.1 +usr/share/man/*/dpkg-parsechangelog.1 +usr/share/man/*/*/dpkg-scanpackages.1 +usr/share/man/*/dpkg-scanpackages.1 +usr/share/man/*/*/dpkg-scansources.1 +usr/share/man/*/dpkg-scansources.1 +usr/share/man/*/*/dpkg-shlibdeps.1 +usr/share/man/*/dpkg-shlibdeps.1 +usr/share/man/*/*/dpkg-source.1 +usr/share/man/*/dpkg-source.1 diff --git a/debian/dpkg-doc.doc-base b/debian/dpkg-doc.doc-base deleted file mode 100644 index 15a4ebd0..00000000 --- a/debian/dpkg-doc.doc-base +++ /dev/null @@ -1,11 +0,0 @@ -Document: dpkg-internals -Title: dpkg Internals Guide -Author: Klee Dienes -Abstract: This manual describes the internal structure of the - dpkg package management system. -Section: Apps/System - -Format: HTML -Index: /usr/share/doc/dpkg-doc/internals/index.html -Files: /usr/share/doc/dpkg-doc/internals/*.html - diff --git a/debian/dpkg-doc.postinst b/debian/dpkg-doc.postinst deleted file mode 100755 index a8c718da..00000000 --- a/debian/dpkg-doc.postinst +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -set -e - -if [ "$1" = configure ]; then - if command -v install-docs >/dev/null 2>&1; then - echo -n "Registering DPKG documentation..." - install-docs -i /usr/share/doc-base/dpkg-doc - echo "done." - fi -fi - diff --git a/debian/dpkg-doc.prerm b/debian/dpkg-doc.prerm deleted file mode 100755 index 7e71d0ba..00000000 --- a/debian/dpkg-doc.prerm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - remove|deconfigure|upgrade) - if command -v install-docs >/dev/null 2>&1; then - echo -n "Unregistering DPKG documentation..." - install-docs -r dpkg-internals || true - echo "done." - fi - ;; -esac - diff --git a/debian/dpkg.cfg b/debian/dpkg.cfg index 3533ff70..a4bba7e3 100644 --- a/debian/dpkg.cfg +++ b/debian/dpkg.cfg @@ -1,12 +1,6 @@ # dpkg configuration file # -# This file can contain default options for dpkg. All commandline -# options are allowed. Values can be specific by putting them after -# the option, seperated by whitespace and/or an `=' sign. +# This file can contain default options for dpkg. All command-line +# options are allowed. Values can be specified by putting them after +# the option, separated by whitespace and/or an `=' sign. # -# Do not enable debsign by default; since Debian does not use embedded -# signature debsign would reject all packages. -no-debsig -# -# Allow file overlaps between packages. -force-overwrite diff --git a/debian/dpkg.conffiles b/debian/dpkg.conffiles deleted file mode 100644 index b0876268..00000000 --- a/debian/dpkg.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/dpkg/origins/debian -/etc/alternatives/README diff --git a/debian/dpkg.docs b/debian/dpkg.docs new file mode 100644 index 00000000..2fa7d0bc --- /dev/null +++ b/debian/dpkg.docs @@ -0,0 +1,3 @@ +AUTHORS +THANKS +debian/pseudo-tags diff --git a/debian/dpkg.install b/debian/dpkg.install new file mode 100644 index 00000000..64fac28c --- /dev/null +++ b/debian/dpkg.install @@ -0,0 +1,43 @@ +../dpkg.cfg etc/dpkg + +etc/alternatives +etc/dpkg/origins +usr/bin/dpkg +usr/bin/dpkg-deb +usr/bin/dpkg-query +usr/bin/dpkg-split +usr/bin/md5sum +usr/lib/dpkg/enoent +usr/lib/dpkg/mksplit +usr/sbin/start-stop-daemon sbin +usr/sbin +usr/share/dpkg +usr/share/locale +usr/share/man/*/*/cleanup-info.8 +usr/share/man/*/cleanup-info.8 +usr/share/man/*/*/dpkg-deb.1 +usr/share/man/*/dpkg-deb.1 +usr/share/man/*/*/dpkg-divert.8 +usr/share/man/*/dpkg-divert.8 +usr/share/man/*/*/dpkg-query.1 +usr/share/man/*/dpkg-query.1 +usr/share/man/*/*/dpkg-split.1 +usr/share/man/*/dpkg-split.1 +usr/share/man/*/*/dpkg-statoverride.8 +usr/share/man/*/dpkg-statoverride.8 +usr/share/man/*/*/dpkg.cfg.5 +usr/share/man/*/dpkg.cfg.5 +usr/share/man/*/*/dpkg.1 +usr/share/man/*/dpkg.1 +usr/share/man/*/*/install-info.8 +usr/share/man/*/install-info.8 +usr/share/man/*/*/md5sum.1 +usr/share/man/*/md5sum.1 +usr/share/man/*/*/start-stop-daemon.8 +usr/share/man/*/start-stop-daemon.8 +usr/share/man/*/*/update-alternatives.8 +usr/share/man/*/update-alternatives.8 +var/lib/dpkg/alternatives +var/lib/dpkg/info +var/lib/dpkg/parts +var/lib/dpkg/updates diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index 0d65a1aa..25babadd 100755 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -1,141 +1,166 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour -set -e -dupdaemonhelp () { - cat </dev/null | awk '{print $1}'`" != \ - "`ls -Li $h 2>/dev/null | awk '{print $1}'`" ] - then - continue - fi - removes="$removes rc$f.d/$g" - done - done - if [ -n "$removes" ] - then - cd /etc - dupdaemonhelp - while [ -n "$removes" ] - do - echo -n 'y=remove, n=leave, l=list, h=help ? ' - read response - case "$response" in - [Yy]*) - echo "Removing duplicate K links ..." - rm -v $removes - removes="" - ;; - [Nn]*) - echo -e "OK, leaving them.\n" - removes="" - ;; - [Ll]*) - echo - echo $removes - echo - ;; - [Hh]*) - dupdaemonhelp - ;; - esac - done - fi - ;; - 1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf ) - response='' - while [ -z "$response" ]; do - echo -n ' -The version of dpkg you'\''re upgrading from had a problem with the +# Remove the /usr/info symlinks we used to generate +remove_info_symlink() { + if [ -L /usr/info ]; then + echo "Removing /usr/info symlink ..." + rm /usr/info + elif [ -L /usr/info/dir ]; then + echo "Removing /usr/info/dir symlink ..." + rm /usr/info/dir + fi +} + + +# Repair damage to /usr/info caused by broken install-info +fix_damaged_info() { + echo -n " +The version of dpkg you're upgrading from had a problem with the install-info program used to maintain the /usr/info/dir file. It may have corrupted the file, for example by placing new entries for the -menu in it before the `* Menu'\'' line (thus making them ineffective) or +menu in it before the \`* Menu' line (thus making them ineffective) or by creating several identical sections. I can try to sort these problems out, but beware that this process is not guaranteed not to mess up a dir file which has things that look like menu entries in the introductory paragraphs. The distributed dir -files do not do this, so if you haven'\''t edited /usr/info/dir it'\''s -almost certainly safe to say `yes'\'' to the next question. - -If you say `no'\'' you may wish to check and/or edit /usr/info/dir yourself. - -Try to check/repair /usr/info/dir automatically ? [y/n] ' - read response - case "$response" in - [Yy]* | '') response=yes ;; - [Nn]*) response=no ;; - *) response='' ;; - esac - done - if [ "$response" = yes ]; then - echo " -Checking/repairing /usr/info/dir ..." - cleanup-info --unsafe - echo - else - echo " -OK. -" - fi +files do not do this, so if you haven't edited /usr/info/dir it's +almost certainly safe to say \"yes\" to the next question. + +If you say \"no\" you may wish to check and/or edit /usr/info/dir yourself. + +Try to check/repair /usr/info/dir automatically ? [y/n] " + read response + case "$response" in + [yY]*|"") + echo "Checking/repairing /usr/info/dir ..." + cleanup-info --unsafe + ;; + *) + echo "OK, leaving it alone." + ;; + esac +} + + +# Remove stop links from runlevels which also have start links +# Dates back to the days when update-rc.d was part of dpkg. +remove_duplicate_daemons() { + for lvl in 0 1 2 3 4 5 6; do + cd /etc/rc$lvl.d + for kill in K[0-9][0-9]*; do + if [ -n "`echo \"x$kill\" | tr -d 0-9A-Za-z_-`" ]; then + continue + fi + + start="`echo $kill | sed -e 's/^K/S/'`" + if ! [ -L $start ] && [ -L $kill ] \ + || [ "`ls -Li $kill 2>/dev/null | awk '{print $1}'`" != \ + "`ls -Li $start 2>/dev/null | awk '{print $1}'`" ] + then + continue + fi + + removes="$removes rc$lvl.d/$kill" + done + done + + if [ -n "$removes" ]; then + echo -n " +Some daemons and similar services whose scripts have links in the +/etc/rcN.d directories have both start (S) and stop (K) links in +some runlevels. Thus these services get stopped and immediately +restarted at some runlevel changes, which is probably not what +you want. + +I can remove these probably-spurious K links if you like: + $removes + +If you're not sure what to do, say \"no\", and then run delete them +by hand later. + +Shall I remove these links ? [y/n] " + read response + case "$response" in + [yY]*|"") + echo "Removing duplicate K links ..." + cd /etc + rm $removes + ;; + *) + echo "OK, leaving them." ;; esac -fi + fi +} -if [ -d /usr/info ] && [ ! -L /usr/info ] && [ ! -L /usr/info/dir ] \ - && [ -f /usr/info/dir ]; then - echo Moving /usr/info/dir to /usr/share/info/dir. - mv /usr/info/dir /usr/share/info/dir - if [ -f /usr/info/dir.old ]; then - mv /usr/info/dir.old /usr/share/info/dir.old - fi - if [ "`find /usr/info -empty`" = "/usr/info" ]; then - echo Making /usr/info a symlink to /usr/share/info. - rmdir /usr/info - ln -s share/info /usr/info - else - echo Making /usr/info/dir a symlink to /usr/share/info/dir. - ln -sf ../share/info/dir /usr/info/dir - fi -fi +case "$1" in + configure) + case "$2" in + 0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' ) + remove_duplicate_daemons + ;; + 1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf) + fix_damaged_info + ;; + esac + + create_database + move_info_directory + remove_info_symlink + ;; -cd /var/lib/dpkg -for f in diversions statoverride status ; do - if [ ! -f "$f" ] ; then - touch "$f" - fi -done + abort-upgrade|abort-deconfigure|abort-remove) + ;; + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac +#DEBHELPER# +exit 0 diff --git a/debian/dpkg.postrm b/debian/dpkg.postrm index 83b81197..cd11e28b 100755 --- a/debian/dpkg.postrm +++ b/debian/dpkg.postrm @@ -1,10 +1,48 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# After the package was removed: +# remove +# +# After the package was purged: +# purge +# +# After the package was upgraded: +# upgrade +# if that fails: +# failed-upgrade +# +# +# After all of the packages files have been replaced: +# disappear +# +# +# If preinst fails during install: +# abort-install +# +# If preinst fails during upgrade of removed package: +# abort-install +# +# If preinst fails during upgrade: +# abort-upgrade -set -e -if [ "$1" = "purge" ] ; then - rm -f /etc/dpkg/dpkg.cfg -fi +case "$1" in + remove) + ;; + + purge) + ;; + + upgrade|failed-upgrade|disappear|abort-install|abort-upgrade) + ;; -exit 0 + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/dpkg.preinst b/debian/dpkg.preinst index 94ced19e..005b1873 100755 --- a/debian/dpkg.preinst +++ b/debian/dpkg.preinst @@ -1,86 +1,175 @@ -#!/bin/sh - - -if [ "$1" != "upgrade" ]; then exit 0; fi - -set -e -# i386elf: [ "$2" = "1.4.0.6" ] || dpkg --assert-support-predepends - -oldver="$2" - -case "$oldver" in - 0.93.[01234]* | - ) ;; - * ) exit 0 ;; -esac - -echo ' -contemplating upgrade of dpkg from pre-0.93.50 version ...' - -trap 'es=$?; rm -f /var/lib/dpkg/bp.$$; exit $es' 0 - -perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im && - ($x=$1) ne "dpkg\n" && - m/^Status:.*(unpacked|postinst)/im' \ - /var/lib/dpkg/status >/var/lib/dpkg/bp.$$ - -if test -s /var/lib/dpkg/bp.$$ -then - echo ' - +#!/bin/sh -e +# This script can be called in the following ways: +# +# Before the package is installed: +# install +# +# Before removed package is upgraded: +# install +# +# Before the package is upgraded: +# upgrade +# +# +# If postrm fails during upgrade or fails on failed upgrade: +# abort-upgrade + + +# Confirm that users are aware that conffile changes will be lost +confirm_conffile_stomp() { + tempfile=/var/lib/dpkg/bp.$$ + + trap 'status=$?; rm -f $tempfile; exit $status' 0 + perl -000 -ne 'print $x if m/^Package:\s+(\S+\n)/im && + ($x=$1) ne "dpkg\n" && + m/^Status:.*(unpacked|postinst)/im' \ + /var/lib/dpkg/status >$tempfile + + if [ -s $tempfile ]; then + echo " WARNING - have you read the release notes for this upgrade ? -The following packages have been unpacked but not yet configured:' - echo '' `cat /var/lib/dpkg/bp.$$` - echo -n ' +The following packages have been unpacked but not yet configured:" + echo " "`cat $tempfile` + + echo -n " If you proceed with the dpkg upgrade with these packages in this state you will LOSE ANY CONFIGURATION CHANGES that have been made to their configuration files. I recommend that you back out of the upgrade now (see below) and then configure each of these packages using: - dpkg --configure --force-hold + dpkg --configure --force-hold If you do this and it fails for some packages they are broken anyway, in -which case you probably don'"'"'t have that much to lose by going ahead +which case you probably don't have that much to lose by going ahead with the upgrade. -Type "yes" to confirm that you really want to do the upgrade in -spite of my warning above; if you give any other response we'"'"'ll back +Type \"yes\" to confirm that you really want to do the upgrade in +spite of my warning above; if you give any other response we'll back off the upgrade to give you a chance to fix things. -Continue with upgrade despite probable loss of config data ? ' +Continue with upgrade despite probable loss of config data ? " + read response case "$response" in - [Yy][Ye][Ss] ) echo OK ... ;; - * ) echo 'Aborting dpkg upgrade.'; exit 1 ;; + [Yy][Ee][Ss]) + echo "OK, going ahead." + ;; + *) + echo "Aborting dpkg upgrade." + exit 1 + ;; esac -fi + fi -echo -n ' + rm -f $tempfile +} + + +# Confirm that the user isn't upgrading anything else at the same time +confirm_singleton() { + echo -n " IMPORTANT - you must install this upgrade on its own, not together in the same dpkg run as any other packages. Otherwise you risk losing configuration information. -If you say "no" to the question below we'"'"'ll back off the upgrade now, +If you say \"no\" to the question below we'll back off the upgrade now, and you can then do it later using: - dpkg --install dpkg-0.93.51.deb -If you'"'"'re not sure what to do, say "no", and then run that command + dpkg --install dpkg-0.93.51.deb + +If you're not sure what to do, say \"no\", and then run that command (with the appropriate dpkg-*.deb filename) from a root shell prompt. -Are you installing only the dpkg upgrade in this dpkg run ? [y/n] ' -read response -case "$response" in -[yY]* | '' ) - echo 'OK, going ahead.' +Are you installing only the dpkg upgrade in this dpkg run ? [y/n] " + read response + case "$response" in + [yY]*|"") + echo "OK, going ahead." + ;; + *) + echo "Aborting dpkg upgrade." + exit 1 + ;; + esac +} + + +# Confirm that dselect got split into it's own package +confirm_dselect_split() { + if ! grep "^Package: *dselect$" /var/lib/dpkg/status >/dev/null; then + echo -n " +IMPORTANT - if you are upgrading this package from within dselect you +_MUST_ install the dselect package first. + +The dselect frontend has been split into a separate \`dselect' package, +which has not yet been unpacked onto your system. Continuing the upgrade +will mean that dselect will temporarily be removed from your system, if +this happens within dselect the upgrade will fail. + +Type \"yes\" to confirm that you really want to do the upgrade in +spite of my warning above (because you're not running dselect, for +example); if you give any other response we'll back off the upgrade to +give you a change to install the dselect package first. + +Continue with upgrade despite separation of dselect ? " + + read response + case "$response" in + [Yy][Ee][Ss]) + echo "OK, going ahead." + ;; + *) + echo "Aborting dpkg upgrade." + exit 1 + ;; + esac + fi +} + + +# Remove obsolete hd method scripts +remove_hd_method() { + methoddir=/usr/lib/dpkg/methods/hd + + if [ -d $methoddir ]; then + echo "Removing obsolete $methoddir ..." + rm -r $methoddir + fi +} + + +case "$1" in + install) ;; -* ) - echo ' -Aborting dpkg upgrade (you will see error messages from dpkg about this).' + + upgrade) + case "$2" in + # Upgrade from non-C dpkg (pre-0.93.50) + 0.93.[01234]* | -) + echo "" + echo "Contemplating upgrade of dpkg from pre-0.93.50 version ..." + + confirm_conffile_stomp + confirm_singleton + confirm_dselect_split + remove_hd_method + ;; + + # Upgrade from pre-dselect split + 0.93.[5678][0-9]* | 1.[023456789]* | 1.1.* | 1.10 | 1.10.[12] ) + confirm_dselect_split + ;; + esac + ;; + + abort-upgrade) + ;; + + + *) + echo "$0 called with unknown argument \`$1'" 1>&2 exit 1 ;; esac -if [ -d /usr/lib/dpkg/methods/hd ] -then - echo 'Removing obsolete /usr/lib/dpkg/methods/hd ...' - rm -r /usr/lib/dpkg/methods/hd -fi - +#DEBHELPER# exit 0 diff --git a/debian/dpkg.prerm b/debian/dpkg.prerm index 786c4448..50477bcb 100755 --- a/debian/dpkg.prerm +++ b/debian/dpkg.prerm @@ -1,15 +1,35 @@ -#!/bin/sh +#!/bin/sh -e +# This script can be called in the following ways: +# +# Before the package is removed: +# remove +# +# Before an upgrade: +# upgrade +# if that fails: +# failed-upgrade +# +# +# Before package is deconfigured while dependency is replaced due to conflict: +# deconfigure in-favour +# removing +# +# Before the package is replaced due to conflict: +# remove in-favour -set -e -if [ ! "$1" = "upgrade" ] && [ ! "$1" = "remove" ]; then - exit 0 -fi +case "$1" in + remove|upgrade) + ;; -cd /usr/bin + failed-upgrade|deconfigure) + ;; -install-info --quiet --remove /usr/info/Guidelines -install-info --quiet --remove /usr/info/debian-guidelines -install-info --quiet --remove /usr/info/guidelines -install-info --quiet --remove /usr/info/debian-guidelines.info.gz -install-info --quiet --remove /usr/info/guidelines.info.gz + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/dselect.cfg b/debian/dselect.cfg index a673a9f3..2d696917 100644 --- a/debian/dselect.cfg +++ b/debian/dselect.cfg @@ -1,7 +1,6 @@ # dselect configuration file # -# This file can contain default options for dselect. All commandline -# options are allowed. Values can be specific by putting them after -# the option, seperated by whitespace and/or an `=' sign. +# This file can contain default options for dselect. All command-line +# options are allowed. Values can be specified by putting them after +# the option, separated by whitespace and/or an `=' sign. # - diff --git a/debian/dselect.conffiles b/debian/dselect.conffiles deleted file mode 100644 index fd7e450c..00000000 --- a/debian/dselect.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/dpkg/dselect.cfg diff --git a/debian/dselect.install b/debian/dselect.install new file mode 100644 index 00000000..ebf6ebae --- /dev/null +++ b/debian/dselect.install @@ -0,0 +1,9 @@ +../dselect.cfg etc/dpkg + +usr/bin/dselect +usr/lib/dpkg/methods +usr/share/man/*/*/dselect.cfg.5 +usr/share/man/*/dselect.cfg.5 +usr/share/man/*/*/dselect.1 +usr/share/man/*/dselect.1 +var/lib/dpkg/methods diff --git a/debian/pseudo-tags b/debian/pseudo-tags index be702628..71c61caf 100644 --- a/debian/pseudo-tags +++ b/debian/pseudo-tags @@ -1,48 +1,54 @@ -Below are the list of pseudo-tags we, the Dpkg Team, are using in the -Debian BTS. Place as many of the following as apply in the subject(title) -of your bug report. +To make management of bugs against the dpkg suite easier we add as many of +the following “pseudo-tags” to the start of the subject (title) as apply +to the bug. -[DOC] Documentation bugs, including --help, manpages, and - others -[ARCH] Archtable updates, porting patches -[INTL] Translation updates, or bugs -[ASSERT] assert errors -[UTF-8] conversion to utf-8 encoding -[SEGFAULT] segfaults -[CONFFILE] any issues with conffile handling -[PERF] performance related issues -[TRIVIAL] bug is trivial/simple to fix +When filing bugs, please do the same to aid triage. -Also, each program that dpkg produces(in any of it's debs) has a -pseudo-tag for it. +[ASSERT] Errors caused by assert(). +[SEGFAULT] Errors that cause segmentation faults. +[CONFFILE] Issues with configuration file handling. +[DEPENDS] Issues with dependency relationship handling. +[TRIVIAL] Bug should be trivial to fix. +[PERF] Performance problems. +[DOC] Documentation bugs, including --help and manpages. +[UTF-8] Conversion to the UTF-8 encoding. +[ARCH] Updates to ‘archtable’ and porting patches. Include + the dpkg architecture name in the tag, + e.g. [ARCH:sparc] +[INTL] New or updated translations and bugs affecting + translation. Include the language code in the tag, + e.g. [INTL:cy_GB] -dpkg.deb: -[DPKG-SPLIT] -[DPKG-QUERY] + +Each program in the dpkg suite has its own pseudo-tag: + +dpkg: [DPKG] [DPKG-DEB] -[MD5SUM] -[U-A] update-alternatives -[INSTALL-INFO] [DPKG-DIVERT] +[DPKG-QUERY] +[DPKG-SPLIT] [DPKG-STATOVERRIDE] -[CLEANUP-INFO] +[MD5SUM] [S-S-D] start-stop-daemon +[CLEANUP-INFO] +[INSTALL-INFO] +[U-A] update-alternatives -dpkg-dev.deb: -[DPKG-NAME] -[DPKG-SOURCE] -[DPKG-GENCHANGES] -[DPKG-GENCONTROL] -[DPKG-SHLIBDEPS] +dpkg-dev: +[822-DATE] +[DPKG-ARCHITECTURE] [DPKG-BUILDPACKAGE] +[DPKG-CHECKBUILDDEPS] [DPKG-DISTADDFILE] -[822-DATE] +[DPKG-GENCHANGES] +[DPKG-GENCONTROL] +[DPKG-NAME] +[DPKG-PARSECHANGELOG] [DPKG-SCANPACKAGES] [DPKG-SCANSOURCES] -[DPKG-ARCHITECTURE] -[DPKG-PARSECHANGELOG] -[DPKG-CHECKBUILDDEPS] +[DPKG-SHLIBDEPS] +[DPKG-SOURCE] -dselect.deb: +dselect: [DSELECT] diff --git a/debian/rules b/debian/rules index 953b0d27..bff0d54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,324 +1,116 @@ #!/usr/bin/make -f -# vim: nowrap ts=8 +# debian/rules for the dpkg suite. +# Copyright © 2004 Scott James Remnant -# Build locations -BUILD := $(CURDIR)/build -TMP := $(CURDIR)/debian/tmp -INSTALL_TMP := $(TMP)/install -TMP_DPKG := $(TMP)/dpkg -TMP_DPKG_DEV := $(TMP)/dpkg-dev -TMP_DPKG_DOC := $(TMP)/dpkg-doc -TMP_DSELECT := $(TMP)/dselect +CFLAGS = -Wall -g +CXXFLAGS = -Wall -g -# We should really get this in a different way... -DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2> /dev/null || true) -DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2> /dev/null || true) -arch := $(shell dpkg-architecture -qDEB_HOST_ARCH) - -GENCONTROL := perl -I $(CURDIR)/scripts $(BUILD)/scripts/dpkg-gencontrol -isp -SHLIBDEPS := perl -I $(CURDIR)/scripts $(BUILD)/scripts/dpkg-shlibdeps - -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - config_arg := --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +# Disable optimisations if ‘noopt’ found in $DEB_BUILD_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CXXFLAGS += -O0 else - config_arg := + CFLAGS += -O2 + CXXFLAGS += -O2 endif -BUILD-DIRS := $(BUILD) $(BUILD)-static +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -# Hacky, but effective -MANDIRS := $(shell sed -n -e '/^SUBDIRS/{s/.*= *//;s/ en / /;p}' $(CURDIR)/man/Makefile.in) - -aclocal.m4: $(wildcard automake/*.m4) - aclocal -I automake +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif -# The following 2 rules should only be run, if their dependants have -# been modified. For clean builds, this won't happen. Only if the -# builder has modified these files after extraction. -configure: configure.in aclocal.m4 - autoconf +# Create configure script if necessary, automake handles rebuilding it. +configure: + dh_testdir -config.h.in: configure.in - autoheader + autoreconf -v -i -config.guess config.sub: %: /usr/share/misc/% - cp -a $< $@.new - mv $@.new $@ +# Configure the build tree +build-tree/config.status: configure + dh_testdir -# Setup the buildlocation -$(BUILD)/configure-stamp: configure config.h.in config.guess config.sub - $(checkdir) - install -d $(@D) - cd $(@D) && LDFLAGS="$(LDFLAGS)" $(shell echo "$(patsubst $(CURDIR)/%,%,$(@D))" | sed -e 's,^[^/][^/]*$$,..,;s,/[^/][^/]*,/..,g' )/configure \ + install -d build-tree + cd build-tree && ../configure $(confflags) \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ --prefix=/usr \ - --datadir=/usr/share \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ + --mandir=\$${datadir}/man \ + --infodir=\$${datadir}/info \ --sysconfdir=/etc \ - --sharedstatedir=/var/lib \ --localstatedir=/var/lib \ - --with-admindir=/var/lib/dpkg \ --with-zlib=static \ - --with-bz2lib=static \ - --with-static-progs \ - $(config_arg) - touch $@ - -clean: - $(checkdir) - rm -f debian/files debian/substvars - rm -f debian/dpkg.substvars debian/dpkg-static.substvars - rm -fr autom4te.cache - rm -fr $(BUILD-DIRS) $(TMP) - rm -f po/{cat-id-tbl.c,stamp-cat-id,*.gmo} - rm -f stamp-build stamp-binary + --with-bz2=static -build: stamp-build +# Build the package in build-tree +build: build-tree/build-stamp +build-tree/build-stamp: build-tree/config.status + dh_testdir -stamp-build: $(BUILD)/configure-stamp - $(MAKE) $(MFLAGS) -C $(BUILD) -# touch $@ - -binary-static: binary-arch-static -binary: binary-arch binary-indep - -stamp-binary-static: stamp-binary -stamp-binary: stamp-build - $(checkdir) - test "`id -u`" -eq 0 - rm -rf $(TMP) - $(MAKE) $(MFLAGS) -C $(BUILD)$* \ - DESTDIR=$(INSTALL_TMP) \ - install - find $(TMP) -type d | xargs chmod 755 + cd build-tree && $(MAKE) touch $@ -binary-dpkg-static-most: TMP_DPKG=$(TMP)/dpkg-static -binary-dpkg-static-most: static=-static -binary-dpkg-static: TMP_DPKG=$(TMP)/dpkg-static -binary-dpkg-static: static=-static - -binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary% - rm -rf $(TMP_DPKG) - install -d -m 755 -o root -g root $(TMP_DPKG) - chmod g-s $(TMP_DPKG) - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/doc/dpkg$(static) - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/lib/dpkg - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/bin - install -d -m 755 -o root -g root $(TMP_DPKG)/sbin - install -d -m 755 -o root -g root $(TMP_DPKG)/var/lib/dpkg - -test -d $(INSTALL_TMP)/etc && cp -a $(INSTALL_TMP)/etc $(TMP_DPKG)/ - set -e ; for i in info alternatives parts updates ; do \ - cp -a $(INSTALL_TMP)/var/lib/dpkg/$$i $(TMP_DPKG)/var/lib/dpkg/ ; \ - done - cp -a $(INSTALL_TMP)/usr/sbin $(TMP_DPKG)/usr/ - mv $(TMP_DPKG)/usr/sbin/start-stop-daemon $(TMP_DPKG)/sbin/ - cp -a $(INSTALL_TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/ - cp -a $(INSTALL_TMP)/usr/lib/dpkg/enoent $(TMP_DPKG)/usr/lib/dpkg/ - cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/ - cp -a $(INSTALL_TMP)/usr/share/dpkg $(TMP_DPKG)/usr/share/ - set -e ; for i in dpkg-split dpkg-query ; do \ - cp -a $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \ - done - set -e ; for i in dpkg dpkg-deb md5sum ; do \ - cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \ - done - set -e ; for i in ChangeLog THANKS TODO copyright; do \ - cp -a $(INSTALL_TMP)/usr/share/doc/dpkg/$$i $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ ; \ - done - cp -a debian/pseudo-tags $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ - set -e ; for i in "" $(MANDIRS) ; do \ - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man1 ; \ - for m in md5sum.1 dpkg-deb.1 ; do \ - if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \ - cp -a $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \ - fi ; \ - done ; \ - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man5 ; \ - for m in dpkg.cfg.5 ; do \ - if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \ - cp -a $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG)/usr/share/man/$$i/man5/$$m ; \ - fi ; \ - done ; \ - install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man8 ; \ - for m in dpkg.8 dpkg-query.8 dpkg-split.8 start-stop-daemon.8 \ - cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8 \ - install-info.8 update-alternatives.8 ; do \ - if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m ] ; then \ - cp -a $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG)/usr/share/man/$$i/man8/$$m ; \ - fi ; \ - done ; \ - done - -# Now that dpkg has been installed, Debianize it -# Policy stuff - find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f - strip --remove-section=.comment --remove-section=.note \ - --strip-unneeded $(TMP_DPKG)/usr/bin/* $(TMP_DPKG)/sbin/* \ - $(TMP_DPKG)/usr/lib/dpkg/enoent - mv $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ChangeLog \ - $(TMP_DPKG)/usr/share/doc/dpkg$(static)/changelog - - install -p -m 644 -o root -g root debian/changelog \ - $(TMP_DPKG)/usr/share/doc/dpkg$(static)/changelog.Debian - rm -f $(TMP_DPKG)/usr/share/doc/dpkg$(static)/copyright - gzip -9 $(TMP_DPKG)/usr/share/doc/dpkg$(static)/* - install -p -m 644 -o root -g root debian/dpkg.cfg \ - $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ - install -p -m 644 -o root -g root debian/copyright \ - $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ - -# Final package creation - install -d -m 755 -o root -g root $(TMP_DPKG)/DEBIAN - install -p -m 644 -o root -g root debian/dpkg.conffiles $(TMP_DPKG)/DEBIAN/conffiles - install -p -m 755 -o root -g root debian/dpkg.preinst $(TMP_DPKG)/DEBIAN/preinst - install -p -m 755 -o root -g root debian/dpkg.prerm $(TMP_DPKG)/DEBIAN/prerm - install -p -m 755 -o root -g root debian/dpkg.postinst $(TMP_DPKG)/DEBIAN/postinst - install -p -m 755 -o root -g root debian/dpkg.postrm $(TMP_DPKG)/DEBIAN/postrm - - $(SHLIBDEPS) -dPre-Depends -Tdebian/dpkg$(static).substvars \ - $(TMP_DPKG)/sbin/start-stop-daemon \ - `test -z "$(static)" && echo $(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/md5sum $(TMP_DPKG)/usr/bin/dpkg-deb` -binary-dpkg binary-dpkg-static: %: %-most - $(GENCONTROL) -Tdebian/dpkg$(static).substvars -pdpkg$(static) -P$(TMP_DPKG) - dpkg --build $(TMP_DPKG) .. +# Install the package underneath debian/tmp +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install + +# Put together the dpkg and dselect packages +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_install --sourcedir=debian/tmp -a + + dh_installchangelogs -pdpkg ChangeLog + dh_installdocs -pdpkg + install -d debian/dselect/usr/share/doc + ln -s dpkg debian/dselect/usr/share/doc/dselect + + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +# Put together the dpkg-dev package +binary-indep: install + dh_testdir -i + dh_testroot -i + dh_install --sourcedir=debian/tmp -i + + install -d debian/dpkg-dev/usr/share/doc + ln -s dpkg debian/dpkg-dev/usr/share/doc/dpkg-dev + + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i -binary-dpkg-dev: stamp-binary - rm -rf $(TMP_DPKG_DEV) - install -d -m 755 -o root -g root $(TMP_DPKG_DEV) - chmod g-s $(TMP_DPKG_DEV) - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/etc/dpkg - install -p -m 644 -o root -g root debian/shlibs.default \ - $(TMP_DPKG_DEV)/etc/dpkg/ - install -p -m 644 -o root -g root debian/shlibs.override \ - $(TMP_DPKG_DEV)/etc/dpkg/ - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/dpkg - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/bin - mv $(INSTALL_TMP)/usr/lib/dpkg/parsechangelog $(TMP_DPKG_DEV)/usr/lib/dpkg/ - mv $(INSTALL_TMP)/usr/lib/dpkg/controllib.pl $(TMP_DPKG_DEV)/usr/lib/dpkg/ - set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \ - dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \ - dpkg-scanpackages dpkg-scansources dpkg-architecture \ - dpkg-parsechangelog dpkg-checkbuilddeps ; do \ - mv $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \ - done - set -e ; for i in "" $(MANDIRS) ; do \ - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \ - for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \ - dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \ - dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \ - dpkg-checkbuilddeps.1 dpkg-scanpackages.1 dpkg-scansources.1; do \ - if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \ - mv $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \ - fi ; \ - done ; \ - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man5 ; \ - for m in deb.5 deb-control.5 deb-old.5 ; do \ - if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \ - mv $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man5/$$m ; \ - fi ; \ - done ; \ - done -# Now that dpkg-dev has been installed, Debianize it -# Policy stuff - find $(TMP_DPKG_DEV)/usr/share/man -type f | xargs gzip -9f - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/doc - ln -s dpkg $(TMP_DPKG_DEV)/usr/share/doc/dpkg-dev - -# Final package creation - install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/DEBIAN - install -p -m 644 -o root -g root debian/dpkg-dev.conffiles $(TMP_DPKG_DEV)/DEBIAN/conffiles - - $(GENCONTROL) -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV) - dpkg --build $(TMP_DPKG_DEV) .. - -binary-dselect: stamp-binary - rm -rf $(TMP_DSELECT) - install -d -m 755 -o root -g root $(TMP_DSELECT) - chmod g-s $(TMP_DSELECT) - - install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/bin - mv $(INSTALL_TMP)/usr/bin/dselect $(TMP_DSELECT)/usr/bin/ - - install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/lib/dpkg - mv $(INSTALL_TMP)/usr/lib/dpkg/methods $(TMP_DSELECT)/usr/lib/dpkg/ - - install -d -m 755 -o root -g root $(TMP_DSELECT)/var/lib/dpkg - mv $(INSTALL_TMP)/var/lib/dpkg/methods $(TMP_DSELECT)/var/lib/dpkg/ - - set -e ; for i in "" $(MANDIRS) ; do \ - install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man5 ; \ - for m in dselect.cfg.5 ; do \ - if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m ] ; then \ - cp -a $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DSELECT)/usr/share/man/$$i/man5/$$m ; \ - fi ; \ - done ; \ - install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/man/$$i/man8 ; \ - for m in dselect.8 ; do \ - if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m ] ; then \ - cp -a $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m $(TMP_DSELECT)/usr/share/man/$$i/man8/$$m ; \ - fi ; \ - done ; \ - done - - install -d -m 755 -o root -g root $(TMP_DSELECT)/etc/dpkg - install -p -m 644 -o root -g root debian/dselect.cfg \ - $(TMP_DSELECT)/etc/dpkg/ - -# Now do the usual Debian stuff - find $(TMP_DSELECT)/usr/share/man -type f | xargs gzip -9f - install -d -m 755 -o root -g root $(TMP_DSELECT)/usr/share/doc - ln -s dpkg $(TMP_DSELECT)/usr/share/doc/dselect - strip --remove-section=.comment --remove-section=.note \ - --strip-unneeded $(TMP_DSELECT)/usr/bin/* - -# Final package creation - install -d -m 755 -o root -g root $(TMP_DSELECT)/DEBIAN - install -p -m 644 -o root -g root debian/dselect.conffiles $(TMP_DSELECT)/DEBIAN/conffiles - - $(SHLIBDEPS) -Tdebian/dselect.substvars \ - $(TMP_DSELECT)/usr/bin/dselect - $(GENCONTROL) -Tdebian/dselect.substvars -pdselect -P$(TMP_DSELECT) - dpkg --build $(TMP_DSELECT) .. - -binary-dpkg-doc: stamp-binary - rm -rf $(TMP_DPKG_DOC) - install -d -m 755 -o root -g root $(TMP_DPKG_DOC) - chmod g-s $(TMP_DPKG_DOC) - install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc/dpkg - mv $(INSTALL_TMP)/usr/share/doc/dpkg/internals $(TMP_DPKG_DOC)/usr/share/doc/dpkg/ - mv $(INSTALL_TMP)/usr/share/doc/dpkg/ChangeLog.manuals \ - $(TMP_DPKG_DOC)/usr/share/doc/dpkg/changelog.manuals - -# Now that dpkg-doc has been installed, Debianize it -# Policy stuff - gzip -9f $(TMP_DPKG_DOC)/usr/share/doc/dpkg/[!i]* - ln -s dpkg $(TMP_DPKG_DOC)/usr/share/doc/dpkg-doc - -# Register documentation with doc-base - install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/usr/share/doc-base - install -p -m 644 -o root -g root debian/dpkg-doc.doc-base \ - $(TMP_DPKG_DOC)/usr/share/doc-base/dpkg-doc - -# Final package creation - install -d -m 755 -o root -g root $(TMP_DPKG_DOC)/DEBIAN - install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm - install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst +binary: binary-arch binary-indep - $(GENCONTROL) -Tdebian/dpkg-doc.substvars -pdpkg-doc -P$(TMP_DPKG_DOC) - dpkg --build $(TMP_DPKG_DOC) .. -binary-arch-static: binary-dpkg-static -binary-arch: binary-dpkg binary-dpkg-static-most binary-dselect +# Clean up the mess we made +clean: + dh_testdir -binary-indep: binary-dpkg-dev binary-dpkg-doc + rm -rf build-tree + dh_clean -define checkdir - test -f include/dpkg.h.in -endef -.PHONY: clean build binary binary-arch binary-indep binary-dpkg binary-dpkg-dev -.PHONY: binary-dpkg-doc binary-nondebbin +.PHONY: build install binary-arch binary-indep binary clean diff --git a/debian/shlibs.default b/debian/shlibs.default index 6408650b..661a889d 100644 --- a/debian/shlibs.default +++ b/debian/shlibs.default @@ -1,12 +1,7 @@ -# Dpkg shlibs defaults file +# dpkg shlibs defaults file # # This file contains shlibs entries that are used as a last resort when -# no matching entries are found elsewhere. For more information see the -# dpkg-shlibdeps manual page. -# -# The format used is: -# -# -# Example: -# libfoo 1 libfoo1 (>= 1.0-1) +# no matching entries are found elsewhere. For more information see the +# dpkg-shlibdeps(1) manual page. # +# diff --git a/debian/shlibs.override b/debian/shlibs.override index 05942d78..fbdb68d4 100644 --- a/debian/shlibs.override +++ b/debian/shlibs.override @@ -1,13 +1,8 @@ -# Dpkg shlibs override file +# dpkg shlibs override file # # Entries in this file will override all others, only use if you # are really sure that is what you want! # -# For more information see the dpkg-shlibdeps manual page. -# -# The format used is: -# -# -# Example: -# libfoo 1 libfoo1 (>= 1.0-1) +# For more information see the dpkg-shlibdeps(1) manual page. # +# diff --git a/depcomp b/depcomp new file mode 100755 index 00000000..25bdb188 --- /dev/null +++ b/depcomp @@ -0,0 +1,526 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2004-04-25.13 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# 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 . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + +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'. + +if test -z "$depfile"; then + base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` + dir=`echo "$object" | sed 's,/.*$,/,'` + if test "$dir" = "$object"; then + dir= + fi + # FIXME: should be _deps on DOS. + depfile="$dir.deps/$base" +fi + +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. In older versions, 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. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` + tmpdepfile="$stripped.u" + if test "$libtool" = yes; then + "$@" -Wc,-M + else + "$@" -M + fi + stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + + if test -f "$tmpdepfile"; then + outname="$stripped.o" + # 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" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +tru64) + # The Tru64 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. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # They are output in .o.d with libtool 1.5. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir.libs/$base.o.d" + tmpdepfile3="$dir.libs/$base.d" + "$@" -Wc,-MD + else + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + if test -f "$tmpdepfile1"; then + tmpdepfile="$tmpdepfile1" + elif test -f "$tmpdepfile2"; then + tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" + fi + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space 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 preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + 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) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + # 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 ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$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 preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + 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 preprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + 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 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/doc/ChangeLog b/doc/ChangeLog deleted file mode 100644 index 6ebe82a0..00000000 --- a/doc/ChangeLog +++ /dev/null @@ -1,153 +0,0 @@ -debian-manuals (2.1.2.3) unstable; - - * internals.sgml: converted to debiandoc format - - -- Ben Collins Sat, 23 Oct 1999 23:32:48 -0400 - -debian-manuals (2.1.2.2) frozen unstable; - - * Fixed even more typographical and grammatical errors in Policy and - Programmer's manual - * Corrected the contact email addresses again. - * Added a paragraph to Policy 6.3 on taking over an old package (Guy Maor) - * Added a paragraph to Programmer 4.2.14 on listing distributions to load - a package into. (Guy Maor) - * Further clarification of use of absolute pathnames in scripts in - Programmer 6.1. - - -- David Morris Tue, 3 Dec 1996 23:28:04 -0600 - -debian-manuals (2.1.2.1) frozen unstable; - - * Many editorial and formatting revisions with suggestions from Ian Jackson, - Guy Maor and others - * correction of chiark address in Policy 6.2 - * footnote in Programmers chapter 2 pointing to deb(5) manpage for - description of deb file format. - * addition of more dpkg examples in Programmer chapter 2 - * Replace paragraph in Policy 4.1 outlining compiling parameters for - shared libraries. - * Added paragraph in Programmer 6.1 on paths in maintainer scripts - (Bug #2481) - * Cleaned up language and formatting of Programmer's 12.2, shlibs - * Corrected contact addresses for listmaster and override-change - - -- David Morris Wed, 27 Nov 1996 08:17:16 -0600 - -debian-manuals (2.1.2.0) frozen unstable; - - * Mostly editorial changes in Policy Manual. - * Added summary of distribution criteria to Introduction - * Added section headings for copyright criteria - * Fixed typos (Bugs #4485, #4622) - * Added paragraph in Compilation Options related to use of shared and - static libraries. (Bug #5299) - * Paragraph added about where to find PGP and other export restricted - packages in section on Procedure - * Change in List administrator and in the contact address for becoming - a package maintainer - * A paragraph added related to who to contact for package maintainer changes. - * Changed where to send upload announcements: uploads destined for unstable, - frozen, or experimental go to debian-devel-changes. - - * Made some mostly editorial changes to Programmers Manual. - * Added a recommendation to debmake in Introduction. - * A further interpretation of the various Distributions is added with - the intent of helping people decide which one to choose. (section 4.2.14) - * Section 12 on Shared Libraries expanded with further technical information - on various shlib files - * Section in 2.2 on format of shlib file moved to new subsection within 12. - * Paragraph on adding a symlink without version number added to Shared - Library Section (Guy Maor, Bug #5299) - - -- David Morris Fri, 22 Nov 1996 23:41:39 -0600 - -debian-manuals (2.1.1.0) unstable; - - * Hard links are forbidden in source packages (they didn't work anyway, - and can't easily be made to work reliably). - * Do not use dpkg-divert or update-alternatives without consultation. - - * Do not need to declare dependencies on Essential packages. - * Restrictions on Pre-Depends stated in policy manual. - * debian/substvars file is now almost always auto-generated. - * Shared libraries must be installed stripped. - * Essential and Pre-Depends put together in policy manual. - - * Explained component-wise (file-wise) vs. package-wise dependencies. - - -- Ian Jackson Thu, 12 Sep 1996 01:00:41 +0100 - -debian-manuals (2.1.0.0) unstable; - - * Upstream changelog must be installed too (was just recommended). - - * Modification to use dpkg-shlibdeps added to conversion instructions. - * Packages which are buggy and orphaned but which are preserved for - compatibility go in contrib. - - * Programmers' manual source package section refers to conversion - instructions in policy manual. - * Make it clear that recommending a non-free or contrib package puts a - package in contrib. - - -- Ian Jackson Sun, 1 Sep 1996 17:47:18 +0100 - -debian-manuals (2.0.1.0) unstable; - - * varargs.h and libtermcap are obsolete - use stdarg.h and ncurses. - * Shared library link/library ordering corrected (aargh). - * When to byte-compile Elisp files. - * Missing final newlines not represented by dpkg-source. - - * Must post upload announcements to debian-changes. - * Moved some sections into new `configuring and building' chapter. - * Typo fixes. - - -- Ian Jackson Sat, 31 Aug 1996 20:07:22 +0100 - -debian-manuals (2.0.0.0) unstable; - - * Footnote added OK'ing copyrights which require name changes. - * More detail about changelog format names. - - * Problematic licence restrictions are formatted as lists. - * Mentioned 822-date utility as way to generate RFC822 format dates. - * Typos corrected. - * Released. - - -- Ian Jackson Mon, 26 Aug 1996 14:27:34 +0100 - -debian-manuals (0.2.1.1) unstable; - - * Can't overwrite directories in one package with files in another. - - -- Ian Jackson Sat, 24 Aug 1996 18:44:54 +0100 - -debian-manuals (0.2.1.0) unstable; - - * Policy says when and how to include original source in upload. - - * Need -sa on dpkg-genchanges/dpkg-buildpackage when converting. - - * Use minor patchlevel for meaning changes which don't affect packages. - * More verbosity about netiquette. - * Reorganised participation and upload policy: merged with mailing lists. - - -- Ian Jackson Fri, 23 Aug 1996 12:48:09 +0100 - -debian-manuals (0.2.0.1) experimental; - - * Said that system administrators' manual does not exist. - - -- Ian Jackson Fri, 23 Aug 1996 04:05:36 +0100 - -debian-manuals (0.2.0.0) experimental; - - * Draft releases. - - -- Ian Jackson Wed, 21 Aug 1996 15:07:53 +0100 - -Local variables: -mode: debian-changelog -End: diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index b06d3d01..00000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ - -default: all - -include ../Makefile.conf - -ifeq (@USE_SGML_DOC@, true) -all: internals.html/index.html -else -all: -endif - -clean: - $(RM) $(srcdir)/manuals-version - $(RM) -rf internals.html/ - -distclean: clean - $(RM) Makefile - -install: install-doc - -manuals-version: $(top_srcdir)/version-nr - set -e ; v=`sed -ne '1s/.*(\(.*\)).*/\1/' $(srcdir)/ChangeLog` ; \ - echo "" > $@ - echo "" >> $@ - -internals.html/index.html: internals.sgml manuals-version - debiandoc2html -n -D. $< - -install-doc: -ifeq (@USE_SGML_DOC@, true) - $(mkinstalldirs) $(DESTDIR)$(docdir)/internals/ - set -e ; for i in internals.html/* ; do \ - bn=`basename $$i` ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \ - done -endif - $(mkinstalldirs) $(DESTDIR)$(docdir)/ - $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals - set -e ; for i in ChangeLog THANKS TODO ; do \ - $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \ - done - $(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(copyingfile) - - -.PHONY: all clean distclean install install-doc -.PHONY: install-doc-recursive diff --git a/doc/database-structure.fig b/doc/database-structure.fig deleted file mode 100644 index 462e2f6c..00000000 --- a/doc/database-structure.fig +++ /dev/null @@ -1,487 +0,0 @@ -#FIG 2.1 -80 2 -6 59 74 199 169 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 129 199 129 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 149 199 149 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 129 69 169 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 59 109 199 109 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 129 139 169 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 199 169 199 89 59 89 59 169 199 169 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 89 139 109 9999 9999 -4 0 12 10 0 -1 0 0.000 4 5 24 64 104 name -4 0 12 10 0 -1 0 0.000 4 9 84 64 122 pkginfoperfile -4 0 12 10 0 -1 0 0.000 4 9 42 74 144 depends -4 0 12 10 0 -1 0 0.000 4 9 48 74 162 depended -4 0 12 10 0 -1 0 0.000 4 9 42 59 84 pkginfo --6 -6 59 394 199 489 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 449 199 449 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 469 199 469 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 449 69 489 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 59 429 199 429 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 449 139 489 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 199 489 199 409 59 409 59 489 199 489 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 409 139 429 9999 9999 -4 0 12 10 0 -1 0 0.000 4 5 24 64 424 name -4 0 12 10 0 -1 0 0.000 4 9 84 64 442 pkginfoperfile -4 0 12 10 0 -1 0 0.000 4 9 42 74 464 depends -4 0 12 10 0 -1 0 0.000 4 9 48 74 482 depended -4 0 12 10 0 -1 0 0.000 4 9 42 59 404 pkginfo --6 -6 59 234 199 329 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 289 199 289 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 309 199 309 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 69 289 69 329 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 59 269 199 269 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 289 139 329 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 199 329 199 249 59 249 59 329 199 329 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 139 249 139 269 9999 9999 -4 0 12 10 0 -1 0 0.000 4 5 24 64 264 name -4 0 12 10 0 -1 0 0.000 4 9 84 64 282 pkginfoperfile -4 0 12 10 0 -1 0 0.000 4 9 42 74 304 depends -4 0 12 10 0 -1 0 0.000 4 9 48 74 322 depended -4 0 12 10 0 -1 0 0.000 4 9 42 59 244 pkginfo --6 -6 559 74 699 169 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 569 129 699 129 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 569 149 699 149 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 569 129 569 169 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 559 109 699 109 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 639 129 639 169 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 699 169 699 89 559 89 559 169 699 169 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 639 89 639 109 9999 9999 -4 0 12 10 0 -1 0 0.000 4 5 24 564 104 name -4 0 12 10 0 -1 0 0.000 4 9 84 564 122 pkginfoperfile -4 0 12 10 0 -1 0 0.000 4 9 42 574 144 depends -4 0 12 10 0 -1 0 0.000 4 9 48 574 162 depended -4 0 12 10 0 -1 0 0.000 4 9 42 559 84 pkginfo --6 -6 399 119 499 214 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 499 214 499 134 399 134 399 214 499 214 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 399 154 499 154 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 399 174 499 174 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 399 194 499 194 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 439 134 439 214 9999 9999 -4 0 12 10 0 -1 0 0.000 4 7 12 404 149 up -4 0 12 10 0 -1 0 0.000 4 7 24 404 169 next -4 0 12 10 0 -1 0 0.000 4 7 24 404 189 list -4 0 12 10 0 -1 0 0.000 4 9 24 404 209 type -4 0 12 10 0 -1 0 0.000 4 9 60 399 129 dependency --6 -6 654 224 754 319 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 754 319 754 239 654 239 654 319 754 319 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 654 259 754 259 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 654 279 754 279 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 654 299 754 299 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 694 239 694 319 9999 9999 -4 0 12 10 0 -1 0 0.000 4 7 12 659 254 up -4 0 12 10 0 -1 0 0.000 4 7 24 659 274 next -4 0 12 10 0 -1 0 0.000 4 7 24 659 294 list -4 0 12 10 0 -1 0 0.000 4 9 24 659 314 type -4 0 12 10 0 -1 0 0.000 4 9 60 654 234 dependency --6 -6 164 294 174 304 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 164 294 174 304 9999 9999 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 164 304 174 294 9999 9999 --6 -6 164 454 174 464 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 164 454 174 464 9999 9999 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 164 464 174 454 9999 9999 --6 -6 464 159 474 169 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 464 159 474 169 9999 9999 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 464 169 474 159 9999 9999 --6 -6 719 264 729 274 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 719 264 729 274 9999 9999 -2 1 0 1 1 0 0 0 0.000 7 0 0 - 719 274 729 264 9999 9999 --6 -6 164 154 174 164 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 164 154 174 164 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 164 164 174 154 9999 9999 --6 -6 354 339 364 349 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 354 339 364 349 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 354 349 364 339 9999 9999 --6 -6 269 259 389 394 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 269 294 389 294 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 269 314 389 314 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 269 334 389 334 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 269 354 389 354 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 329 274 329 394 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 389 394 389 274 269 274 269 394 389 394 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 269 374 389 374 9999 9999 -4 0 12 10 0 -1 0 0.000 4 9 48 269 269 deppossi -4 0 12 10 0 -1 0 0.000 4 7 12 274 289 up -4 0 12 10 0 -1 0 0.000 4 7 24 274 309 next -4 0 12 10 0 -1 0 0.000 4 7 12 274 329 ed -4 0 12 10 0 -1 0 0.000 4 7 42 274 389 version -4 0 12 10 0 -1 0 0.000 4 7 42 274 349 nextrev -4 0 12 10 0 -1 0 0.000 4 7 42 274 369 backrev --6 -6 354 359 364 369 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 354 359 364 369 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 354 369 364 359 9999 9999 --6 -6 74 564 194 599 -4 0 12 12 0 -1 0 0.000 4 12 84 74 579 Package: foo -4 0 12 12 0 -1 0 0.000 4 12 119 74 595 Depends: a | b, c --6 -6 389 449 399 459 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 389 449 399 459 9999 9999 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 389 459 399 449 9999 9999 --6 -6 389 509 399 519 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 389 509 399 519 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 389 519 399 509 9999 9999 --6 -6 304 409 424 544 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 304 444 424 444 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 304 464 424 464 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 304 484 424 484 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 304 504 424 504 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 364 424 364 544 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 424 544 424 424 304 424 304 544 424 544 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 304 524 424 524 9999 9999 -4 0 12 10 0 -1 0 0.000 4 9 48 304 419 deppossi -4 0 12 10 0 -1 0 0.000 4 7 12 309 439 up -4 0 12 10 0 -1 0 0.000 4 7 24 309 459 next -4 0 12 10 0 -1 0 0.000 4 7 12 309 479 ed -4 0 12 10 0 -1 0 0.000 4 7 42 309 539 version -4 0 12 10 0 -1 0 0.000 4 7 42 309 499 nextrev -4 0 12 10 0 -1 0 0.000 4 7 42 309 519 backrev --6 -6 259 119 359 214 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 359 214 359 134 259 134 259 214 359 214 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 259 154 359 154 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 259 174 359 174 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 259 194 359 194 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 299 134 299 214 9999 9999 -4 0 12 10 0 -1 0 0.000 4 7 12 264 149 up -4 0 12 10 0 -1 0 0.000 4 7 24 264 169 next -4 0 12 10 0 -1 0 0.000 4 7 24 264 189 list -4 0 12 10 0 -1 0 0.000 4 9 24 264 209 type -4 0 12 10 0 -1 0 0.000 4 9 60 259 129 dependency --6 -6 479 279 599 414 -6 564 359 574 369 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 564 359 574 369 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 564 369 574 359 9999 9999 --6 -6 564 319 574 329 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 564 319 574 329 9999 9999 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 564 329 574 319 9999 9999 --6 -6 479 279 599 414 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 479 314 599 314 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 479 334 599 334 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 479 354 599 354 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 479 374 599 374 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 539 294 539 414 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 599 414 599 294 479 294 479 414 599 414 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 479 394 599 394 9999 9999 -4 0 12 10 0 -1 0 0.000 4 9 48 479 289 deppossi -4 0 12 10 0 -1 0 0.000 4 7 12 484 309 up -4 0 12 10 0 -1 0 0.000 4 7 24 484 329 next -4 0 12 10 0 -1 0 0.000 4 7 12 484 349 ed -4 0 12 10 0 -1 0 0.000 4 7 42 484 409 version -4 0 12 10 0 -1 0 0.000 4 7 42 484 369 nextrev -4 0 12 10 0 -1 0 0.000 4 7 42 484 389 backrev --6 -6 564 379 574 389 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 564 379 574 389 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 564 389 574 379 9999 9999 --6 -1 3 0 1 4 0 0 0 0.000 1 0.000 569 304 5 5 569 304 574 309 -1 3 0 1 6 0 0 0 0.000 1 0.000 569 344 5 5 569 344 574 349 -4 0 0 12 0 -1 0 0.000 4 6 5 589 289 c --6 -6 644 409 764 544 -6 729 489 739 499 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 729 489 739 499 9999 9999 -2 1 0 1 5 0 0 0 0.000 7 0 0 - 729 499 739 489 9999 9999 --6 -6 729 449 739 459 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 729 449 739 459 9999 9999 -2 1 0 1 2 0 0 0 0.000 7 0 0 - 729 459 739 449 9999 9999 --6 -6 644 409 764 544 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 644 444 764 444 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 644 464 764 464 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 644 484 764 484 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 644 504 764 504 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 704 424 704 544 9999 9999 -2 2 0 1 -1 0 0 0 0.000 0 0 0 - 764 544 764 424 644 424 644 544 764 544 9999 9999 -2 1 2 1 -1 0 0 0 3.000 -1 0 0 - 644 524 764 524 9999 9999 -4 0 12 10 0 -1 0 0.000 4 9 48 644 419 deppossi -4 0 12 10 0 -1 0 0.000 4 7 12 649 439 up -4 0 12 10 0 -1 0 0.000 4 7 24 649 459 next -4 0 12 10 0 -1 0 0.000 4 7 12 649 479 ed -4 0 12 10 0 -1 0 0.000 4 7 42 649 539 version -4 0 12 10 0 -1 0 0.000 4 7 42 649 499 nextrev -4 0 12 10 0 -1 0 0.000 4 7 42 649 519 backrev --6 -1 3 0 1 4 0 0 0 0.000 1 0.000 734 434 5 5 734 434 739 439 -1 3 0 1 6 0 0 0 0.000 1 0.000 734 474 5 5 734 474 739 479 -1 3 0 1 5 0 0 0 0.000 1 0.000 734 514 5 5 734 514 739 519 -4 0 0 12 0 -1 0 0.000 4 9 6 744 419 b -4 0 12 12 0 7 0 0.000 4 9 28 719 539 >1.0 --6 -6 449 564 589 599 -4 0 12 12 0 -1 0 0.000 4 12 70 449 579 Package: c -4 0 12 12 0 -1 0 0.000 4 11 140 449 595 Recommends: b (>1.0) --6 -1 3 0 1 1 0 0 0 0.000 1 0.000 169 139 5 5 169 139 174 144 -1 3 0 1 1 0 0 0 0.000 1 0.000 669 139 5 5 669 139 674 144 -1 3 0 1 1 0 0 0 0.000 1 0.000 329 164 5 5 329 164 334 169 -1 3 0 1 2 0 0 0 0.000 1 0.000 329 184 5 5 329 184 334 189 -1 3 0 1 2 0 0 0 0.000 1 0.000 469 184 5 5 469 184 474 189 -1 3 0 1 2 0 0 0 0.000 1 0.000 724 289 5 5 724 289 729 294 -1 3 0 1 5 0 0 0 0.000 1 0.000 169 479 5 5 169 479 174 484 -1 3 0 1 5 0 0 0 0.000 1 0.000 669 159 5 5 669 159 674 164 -1 3 0 1 4 0 0 0 0.000 1 0.000 724 249 5 5 724 249 729 254 -1 3 0 1 4 0 0 0 0.000 1 0.000 329 144 5 5 329 144 334 149 -1 3 0 1 4 0 0 0 0.000 1 0.000 469 144 5 5 469 144 474 149 -1 3 0 1 5 0 0 0 0.000 1 0.000 169 319 5 5 169 319 174 324 -1 3 0 1 2 0 0 0 0.000 1 0.000 359 304 5 5 359 304 364 309 -1 3 0 1 4 0 0 0 0.000 1 0.000 359 284 5 5 359 284 364 289 -1 3 0 1 6 0 0 0 0.000 1 0.000 359 324 5 5 359 324 364 329 -1 3 0 1 5 0 0 0 0.000 1 0.000 394 494 5 5 394 494 399 499 -1 3 0 1 4 0 0 0 0.000 1 0.000 394 434 5 5 394 434 399 439 -1 3 0 1 6 0 0 0 0.000 1 0.000 394 474 5 5 394 474 399 479 -2 1 0 1 5 0 0 0 0.000 7 1 0 - 0 0 1.000 4.000 8.000 - 169 479 299 479 9999 9999 -2 1 0 1 1 0 0 0 0.000 -1 0 1 - 0 0 1.000 4.000 8.000 - 394 164 329 164 9999 9999 -3 2 0 1 1 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 169 139 199 139 219 144 239 149 254 149 9999 9999 - 0.000 -190.000 186.321 138.362 193.821 138.362 203.746 139.584 - 214.444 142.861 223.556 145.139 234.254 148.416 241.590 149.319 - 245.340 149.319 0.000 -190.000 -3 2 0 1 1 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 669 139 704 144 719 154 734 234 9999 9999 - 0.000 -190.000 689.270 140.465 698.020 141.715 708.066 145.553 - 716.306 149.925 728.121 167.798 731.871 187.798 0.000 -190.000 -3 2 0 1 2 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 329 184 319 184 314 184 304 194 304 199 304 259 9999 9999 - 0.000 0.000 323.209 184.000 320.709 184.000 317.861 184.000 - 315.246 183.484 310.477 185.460 305.459 190.476 303.484 195.246 - 304.000 197.861 304.000 209.251 304.000 224.251 0.000 0.000 -3 2 0 1 2 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 359 304 389 309 399 339 404 384 404 419 9999 9999 - 0.000 0.000 376.183 303.206 383.683 304.456 396.372 315.299 - 397.434 331.869 401.243 349.210 403.427 373.663 404.332 389.993 - 404.332 398.743 0.000 0.000 -3 2 0 1 2 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 469 184 504 189 534 229 549 289 9999 9999 - 0.000 0.000 489.097 184.107 497.847 185.357 515.602 195.870 - 528.871 218.224 538.758 238.997 542.508 253.997 0.000 0.000 -3 2 0 1 2 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 724 289 709 299 704 414 9999 9999 - 0.000 0.000 714.657 293.115 710.907 295.615 696.821 320.614 - 695.571 349.364 0.000 0.000 -3 2 0 1 5 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 394 494 444 499 569 499 639 499 9999 9999 - 0.000 0.000 422.899 497.321 435.399 498.571 472.526 500.423 - 540.524 499.000 580.960 499.000 598.460 499.000 0.000 0.000 -3 2 0 1 5 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 669 159 649 159 634 164 604 204 579 289 9999 9999 - 0.000 0.000 657.478 158.436 652.478 158.436 645.334 159.595 - 637.243 161.663 623.745 171.392 609.302 193.426 596.954 218.053 - 590.704 239.303 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 394 434 414 429 419 424 414 279 364 219 9999 9999 - 0.000 0.000 405.666 432.138 410.666 430.888 415.525 428.137 - 418.291 425.798 433.545 387.100 427.322 313.905 408.621 264.907 - 396.121 249.907 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 569 304 554 234 529 189 504 174 9999 9999 - 0.000 0.000 562.162 263.254 558.412 245.754 549.770 222.731 - 537.823 198.122 525.252 185.125 519.002 181.375 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 359 284 359 249 354 219 9999 9999 - 0.000 0.000 359.497 263.759 359.497 255.009 358.568 243.779 - 357.318 236.279 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 734 434 724 379 724 324 9999 9999 - 0.000 0.000 727.366 402.355 724.866 388.605 723.148 369.549 - 723.148 355.799 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 724 249 719 209 699 174 9999 9999 - 0.000 -190.000 722.530 225.840 721.280 215.840 716.720 202.160 - 711.720 193.410 0.000 -190.000 -3 2 0 1 4 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 329 144 304 144 269 139 219 124 204 124 9999 9999 - 0.000 -190.000 314.537 144.305 308.287 144.305 295.917 143.426 - 276.919 140.743 257.308 136.426 231.067 125.771 216.399 123.618 - 212.649 123.618 0.000 -190.000 -3 2 0 1 5 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 169 319 189 319 229 324 254 329 264 329 9999 9999 - 0.000 0.000 180.574 318.787 185.574 318.787 198.208 319.573 - 219.921 322.527 234.742 324.932 248.152 328.421 255.720 329.170 - 258.220 329.170 0.000 0.000 -3 2 0 1 6 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 394 474 339 469 299 469 259 469 234 469 204 469 9999 9999 - 0.000 0.000 362.200 470.679 348.450 469.429 329.874 468.586 - 308.112 469.000 289.888 469.000 268.112 469.000 253.305 469.000 - 239.695 469.000 228.874 469.000 221.374 469.000 0.000 0.000 -3 2 0 1 6 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 734 474 659 469 434 484 299 489 204 489 9999 9999 - 0.000 0.000 690.661 470.250 671.911 469.000 607.354 469.001 - 485.316 481.339 403.258 485.594 329.783 488.430 282.765 489.301 - 259.015 489.301 0.000 0.000 -3 2 0 1 6 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 569 344 594 339 619 304 634 204 644 174 9999 9999 - 0.000 0.000 583.473 343.015 589.723 341.765 603.620 332.780 - 615.079 313.689 628.219 281.222 628.581 226.603 635.271 198.699 - 637.771 191.199 0.000 0.000 -3 2 0 1 6 0 0 0 0.000 1 0 - 0 0 1.000 4.000 8.000 - 359 324 294 319 204 309 9999 9999 - 0.000 0.000 321.344 321.293 305.094 320.043 278.591 317.552 - 256.091 315.052 0.000 0.000 -3 2 0 1 5 0 0 0 0.000 0 1 - 0 0 1.000 4.000 8.000 - 429 514 564 519 714 519 734 514 9999 9999 - 0.000 0.000 507.163 517.323 540.913 518.573 598.180 519.633 - 679.471 523.251 717.559 518.562 722.559 517.312 0.000 0.000 -3 2 0 1 4 0 0 0 0.000 0 1 - 0 0 1.000 4.000 8.000 - 204 99 364 109 414 139 469 144 9999 9999 - 0.000 0.000 296.049 97.811 336.049 100.311 377.555 113.214 - 400.605 134.627 423.515 142.106 437.265 143.356 0.000 0.000 -4 0 0 12 0 -1 0 0.000 4 9 15 159 104 foo -4 0 0 12 0 -1 0 0.000 4 6 5 479 129 c -4 0 0 12 0 -1 0 0.000 4 12 42 309 209 depends -4 0 0 12 0 -1 0 0.000 4 12 42 449 209 depends -4 0 0 12 0 -1 0 0.000 4 9 6 744 234 b -4 0 0 12 0 -1 0 0.000 4 6 18 714 314 rec. -4 0 0 12 0 -1 0 0.000 4 6 6 164 264 a -4 0 0 12 0 -1 0 0.000 4 9 6 164 424 b -4 0 0 12 0 -1 0 0.000 4 6 5 664 104 c -4 0 0 18 0 -1 0 0.000 4 17 632 64 54 example of the structures (in the C code) which contain related packages information -4 0 12 12 0 -1 0 0.000 4 12 70 284 589 Package: a -4 0 0 12 0 -1 0 0.000 4 6 6 374 269 a -4 0 0 12 0 -1 0 0.000 4 9 6 384 419 b -4 0 0 12 0 -1 0 0.000 4 9 15 339 129 a|b -4 0 12 12 0 -1 0 0.000 4 12 70 674 589 Package: b diff --git a/doc/en/reference.sgml b/doc/en/reference.sgml deleted file mode 100644 index fe35c7b8..00000000 --- a/doc/en/reference.sgml +++ /dev/null @@ -1,976 +0,0 @@ -Debian"> - dpkg"> - dselect"> - .deb"> -]> - - - dpkg reference Manual - draft - - - - Wichert - Akkerman - -
- wichert@deephackmode.org -
- - - - - - 2001 - 2002 - Wichert Akkerman - - - - - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 or any - later version published by the Free Software Foundation. There are - no invariant sections. A copy of the license is included in the section - entitled "GNU Free Documentation License". - - - - - - Preface - - - This manual is a reference to the &debian; package management system. - - - - This manual is currently being written based on the previous packaging - manual and as such is a work in progress. - - - - - Introduction - - - The Debian package management system is build up from various seperate - tools that work together form a comprehensive system to manage your - system. - - - - This document describes all the tools that used to handle and produce - them as well as the file formats used. - - - - - - Version numbers - - - It is essential for a packaging system to have a documented method to - compare version numbers. Unfortunately there are different ways of - dealing with them, each with their own good and bad sides. This chapter - describes how &dpkg; compares version numbers. - - - - Version numbers are ASCII strings made up from alphanumeric characters - (letters and digits) and the hyphen (-), dot - (.), plus (+), minus - (-) and colon (:) characters. - - - - A version number consists of two parts: the upstream version, and - optionally the package revision, which are seperated by a hyphen. - If there is no seperate package revision then the upstream version is - not allowed to contain a hyphen. - - - - Comparing version numbers is done by breaking them into pieces and - comparing those from left to right. Pieces are seperated by a - transition from numbers to letters and by non-alphanumeric - characters. Starting from &dpkg; 1.10 numbers of unlimited length may - be used. Olders versions converted numbers to integers before comparing - them and as a result can not handle numbers that do not fit into the C - type int (2^31-1 on 32bit architectures and 2^63-1 on 64bit - architectures). - - - - - - Managing diversions - - - Diversions are a method to instruct &dpkg; to use a different filename - when installing a file. This can be useful to prevent conflicts between - related packages or when a system administator wants to replace a file - with another version. - - - - Diversions are specific to either a package or the local system. A - package specific diversion will only divert a file if it does not - belongs to a specific package that was given when the diversion was - created. This allow a package to divert a file from other packages and - replacing them with its own copy. Local diversions are applied to all - packages and can be used by the system administrator. - - -
- Managing diversions with dpkg-divert - - - - The official documentation for dpkg-divert can always - be found online in the - dpkg-divert - 8 manual page. - - - -
- Adding new diversions - - New options can be added using the --add - option for dpkg-divert. Its syntax is: - - -
- -
- - - - Managing file permissions / ownership - - - When you install a package &dpkg; will use the ownership and permissions - that are used inside the package. In some situations you might not agree - with those defaults and would like to use other settings. To support this - a feature called statoverrides was introduced in &dpkg; 1.8.0, and an - accompanying tool called dpkg-statoverride. - - - - - Even though we use the word file here, this applies to all filesystem - objects that &dpkg; handles, including directories, - devices, etc. - - - - - - If you look at the &dpkg; changelog you will see that statoverrides - were actually added in version 1.7.0. However that version had - some problems both in dpkg-statoverrides which - broke adding and removing of overrides and in &dpkg; itself which - made it only apply overrides to normal files. Both problems - were fixed in version 1.8.0. - - - -
- How permissions and ownership are applied - - - &dpkg; uses the following logic to determine the ownership and - permissions to use when installing a file: - - - - Check if there is a statoverride registered for this file - - - If an override is present use the ownership and permission - specified in the override. - - If no override is present: - - - Check if there is a system account with the same name - as the owner used inside the archive. If so use that as owner, - otherwise use the uid as used in the package. - - - Check if there is a system group with the same name - as the group used inside the archive. If so use that as group, - otherwise use the gid as used in the package. - - - Use the permissions as used in the package. - - - - - - - The exact method that &dpkg; uses to set the ownership and permissions - depends on the type of file that is being created: - - - - - regular files - Created with owner and group set to - root and with mode 0. After the data has - been written to the file the ownership and mode are set to their - final values. - - - - - FIFOs - character and block devices - directories - Created with owner and group set to - root and with mode 0, and then updated - to set the ownership and mode to their final values. - - - - - Hardlinks - After the link has been made its ownership and - permissions are setup. This means the original file - will also be changed! - - - -
- -
- Managing overrides with dpkg-statoverride - - - - The official documentation for dpkg-statoverride can - always be found online in the - dpkg-statoverride - 8 manual page. - - - -
- Listing overrides - - - You can get a list of all overrides present in the database by using the - option: - - -
- dpkg-statoverride <glob> -
- - - There is an optional glob option that restricts the output from - to overrides for files that match the glob - expression. - - - - - Please see the sh - 1 or - glob7 - for a description of glob syntax. - - - - - Listing overrides - -[fog;~]-1# dpkg-statoverride --list -root root 0755 /bin/mount -root root 0755 /bin/ping -[fog;~]-2# dpkg-statoverride --list '*mount*' -root root 0755 /bin/mount - - -
- -
- Adding new overrides - - - New options can be added using the option - for dpkg-statoverride. Its syntax is: - - -
- dpkg-statoverride <user> <group> <mode> <file> -
- - - This will add an override for <file> by - telling &dpkg; to use the user, group and mode given to - dpkg-statoverride. The user and group can be - specified in two ways: either by using the name as found in the - system account database (ie /etc/passwd, NIS or - another source configured in - /etc/nsswitch.conf), or by using a number - prefixed with #. - - - - Adding an override - - - -[fog;~]-1# ls -l /bin/mount --rwsr-xr-x 1 root root 56284 Nov 23 06:14 /bin/mount -[fog;~]-2# dpkg-statoverride --add root root 0755 /bin/mount -[fog;~]-3# ls -l /bin/mount --rwsr-xr-x 1 root root 56284 Nov 23 06:14 /bin/mount - - - - - Adding an override does not update the file on the filesystem, unless - you also specify the option. - - - - Adding an override using --update - - -[fog;~]-1# ls -l /bin/mount --rwsr-xr-x 1 root root 56284 Nov 23 06:14 /bin/mount -[fog;~]-2# dpkg-statoverride --update --add root root 0755 /bin/mount -[fog;~]-3# ls -l /bin/mount --rwxr-xr-x 1 root root 56284 Nov 23 06:14 /bin/mount - - - - - If an override already exists and you want to replace it you can - use the to force dpkg-statoverride - to replace the existing override. - - - - Replacing an existing override - -[fog;~/sources/play/pkg-manual]-1# dpkg-statoverride --add root root 0755 /bin/mount -An override for "/bin/mount" already exists, aborting -[fog;~]-2# dpkg-statoverride --force --add root root 0755 /bin/mount -An override for "/bin/mount" already exists, but --force specified so lets ignore it. -[fog;~]-3# dpkg-statoverride --list /bin/mount -root root 0755 /bin/mount - - -
- -
- Removing overrides - - Overrides can be removed using the option, - which takes a single filename as argument: - - -
- dpkg-statoverride <file> -
- - - This will remove the override for <file> - from the database. - - - - When an override for a file is removed its ownership and permission - are not restored to the original value. - - - - - Removing an override - -[fog;~]-1# dpkg-statoverride --list -root root 0755 /bin/mount -[fog;~]-2# dpkg-statoverride --remove /bin/mount -[fog;~]-3# dpkg-statoverride --list -[fog;~]-4# - - -
- -
- - - - - File formats - - This chapter describes all the file formats used by the package tools. - All files are text files which you can view and modify using any normal - text editor if needed. - - - - Most file formats are based on the RFC822 format, which is best known - as the format used in e-mail headers. - - - - Each format has a version number which indicates the revision of the - format being used. This version is always of the form "X.Y". The - first number (X) is the major version. Within a major version the only - allowed changes in format are the addition of new fields. This guarantees - that tools will always be fully backwards and upwards compatible within - a major version. - - -
- RFC822 - - A RFC822 style messages consists of one or more blocks, seperated by - null lines (an empty line). Each block is made up of fields. Fields - can be folded over multiple lines by inserting a 'newline whitespace' - pair. This combination is interpreted as a single whitespace. - - - - Each fiels is a single line consisting of a field-name and a - field-body, seperated by a colon (:). The field-name is made up - from printable ASCII characters minus the colon. The field-body - may be composed of all ASCII characters except CR or LF (they - are automatically removed when unfolding lines). - - - - RFC822 style file - - -Header: value -Description: this is an example of an RFC822 style message - -Section: new -Name: body -Description: this is block 2 of the example -X-Fortune: - To be excellent when engaged in administration is to be like the North - Star. As it remains in its one position, all the other stars surround it. - -- Confucius - - -
- -
- changes file - - - The .changse file is used to describe a set of - files that is going to be installed in an archive. All files have to - belong to the same source package. The data in a - changes include the changes made since the - previous revision, version and architecture information and the list - of files that form the change set along with a checksum - - - - Just like other dpkg datafiles this file is formated using RFC822 - syntax. In addition the file can signed as an OpenPGP ASCII armored - message (see RFC2440). The table below lists the allowed fields - in a .dsc file. The order used is not important, - although dpkg-genchanges will output the fields using - the ordering used in the table. - - - - Fields in a <filename>.changes</filename> file - - - - Field - Description - - - - - - Format - - Version of the file format used. Currently 1.7. - - - - Date - - The date (in RFC822 format) when the change set was build. - - - - Source - - The name of the source package from which the changes were - build. - - - - Binary - - The binary packages (ie &deb; files) that are part of the - change set. - - - - Architecture - - A space seperate list of architectures for which files are - included in the set. - - - - Version - - Version number of the source from which the files were built. - - - - Distribution - - Distribution in which the changes should be installed, as taken from - debian/changelog. - - - - Urgency - - Urgency of the changes, as taken from - debian/changelog. - - - - Maintainer - - The maintainer of the package, as listed in - debian/control. - - - - Changed-By - - The person who made the last changes to the sources, as - listed in debian/changelog. - - - - Description - - Multi-line field describing the &deb; files in the package. - Each line describes a single package in the format - "packagename - short description". - - - - Closes - - Space seperate list of bugreports which are closed by this - change set. (Optional) - - - - Changes - - Multi-line field with the changes made since the previous - version, as taken from debian/changelog. - Can possibly mention changes for multiple versions. - - - - Files - - Multi-line field with the list of files in the change set. - Each line describes a single file in the format "MD5 filesize - filename". - - - - -
-
- -
- dsc file - - - The .dsc file describes the source for a Debian - package: it contains general information over the source such as the - name of the package and which binary package it produces as well as - the files that contain the sourcecode. - - - - Just like other dpkg datafiles this file is formated using RFC822 - syntax. In addition the file can signed as an OpenPGP ASCII armored - message (see RFC2440). The table below lists the allowed fields - in a .dsc file. The order used is not important, - although dpkg-source will output the fields using - the ordering used in the table. - - - - Fields in a <filename>.dsc</filename> file - - - FieldDescription - - - Format - Version of the file format used. Currently 1.0. - - Source - Name of the source package - Version - Version number of the source - Binary - comma seperated list of binary packages build from this - source - Origin - Name of the organization that procuded this package - - Maintainer - Maintainer of this package - Uploaders - Multi-line field with list of people authorized to make - uploads of a package (optional) - Architecture - Space seperated list of architectures for which package - are build from this source - Standards-Version - Version of &debian; policy this package is complient - with - Files - Multi-line field with list of files with the actual source - code - - -
- - - The Files field contains one line for each file that is - contains source for this package (only 2 files are supported: a - .tar.gz file with the (original) source, and - an optional .diff.gz with Debian changes to the - source). Each file description consists of 3 items, seperated by - a single space: - - - A MD5 checksum of the file - The filesize in bytes - The filename - - - - - modutils .dsc file - - ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -Format: 1.0 -Source: modutils -Version: 2.4.1-1 -Binary: modutils -Origin: debian -Maintainer: Wichert Akkerman <wakkerma@debian.org> -Architecture: any -Standards-Version: 3.2.0 -Files: - 6d69ff476c964e703659d950999e411c 246022 modutils_2.4.1.orig.tar.gz - 3de7100460662472404f8a83cccde6da 17219 modutils_2.4.1-1.diff.gz - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.0.4 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -iEYEARECAAYFAjpbNIAACgkQPLiSUC+jvC1CFQCePvKBH6qT7/BKXVHCamKXZvZq -Be8An1QDPcyDFtMddYJw/BwTVphbwzU6 -=Zl3g ------END PGP SIGNATURE----- - - -
- -
- control - - - Fields in the source section of the <filename>control</filename> - file - - - Field - required - Description - - - - Sourceyes - Name of the source package - Sectionno - Package category for this package, used by frontends. - - Priorityno - Indication of package importance. Legal values are - extra, important, optional, required and standard. - - Maintaineryes - Name of the source package - Standards-Versionno - Version of &debian; policy this package is complient - with - Build-Depends, Build-Conflicts, - Build-Depends-Indep, Build-Conflicts-Indepno - Specify demands on the build environment - Bugsno - Name of the source package - Originno - Name of the source package - - -
- - - - Fields in the package section of the <filename>control</filename> - file - - - Field - required - Description - - - - Packageyes - Name of the package - Architectureyes - Space seperated list of architectures for which package - are build from this source - Essentialno - Indicates if a package is essential to the system - - Pre-Depends, Depends, Recommends, Suggests, Replaces, - Conflictsno - Specify relations to other packages - Descriptionyes - Description of the package - - -
-
- -
- diversions - - - The diversions file contains all the alternatives - defined on this system. It is located in the &dpkg; admin directory. - - - - - This is an internal &dpkg; file: do not edit it by hand unless really - needed, but use the dpkg-divert tool instead. - - - - - For each diversion there are 3 lines in the diversions file: - - - The name of the file that will be diverted. - - - - The filename that the diverted file will be diverted to. - - - - The name of the package that made this diversion. If it is a - local (ie user) diversion the magic packagename `:' is used - instead. - - - - - - Example <filename>diversions</filename> file - - -/sbin/modprobe -/sbin/modprobe.orig -: -/usr/bin/locate -/usr/bin/locate.notslocate -slocate - - -
- -
- statoverrides - - This file contains the list of all statoverrides that &dpkg; uses - when unpacking packages. It is located in the &dpkg; admin - directory. Each line in the file represents one override, and - comments are not allowed. - - - - - This is an internal &dpkg; file: do not edit it by hand unless really - needed, but use the dpkg-statoverride tool instead. - - - - - Each line contains 4 items, seperated by whitespace: - - - The owner to use. This can be either an accountname that must - be present on the system, or a numerical uid. Uids are prefixed - with a #. - - - - The group to use. This can be either a group that must be present on - the system, or a numerical gid. Gids are prefixed - with a #. - - - - Mode to use for this file. This is an octal number. - - - - The filesystem object (file, directory, device, FIFO or link) - to which this override should be applied. Since this is the - last item on a line it may contain whitespace. - - - - - - Example <filename>statoverride</filename> file - -root wheel 04750 /bin/su -root adm 0750 /var/log/apache - - - - This will tell &dpkg; to do the following: - - - - /bin/su is installed owned by - user root and group - wheel with mode 04750. This means - that only people in the wheel - group are allowed to run su. - - - /var/log/apache is installed - owned by user root and group - adm with mode 0750. This - restricts the ability to view the - apache to people in the - adm group by disallowing others - to access the /var/log/apache directory. - - - -
- -
- alternatives - - - The configuration for alternatives is spread over two places: the - symlink to the selected alternative is stored in /etc/alternatives - and the list of available alternatives is kept in a series of files - in /var/lib/dpkg/alternatives/. - - - - For each alternative there is a single file in - /var/lib/dpkg/alternatives/ named after the - the alternative it describes. The file is a normal text file: - - - - - - The first line lists the state of the alternative, either - `manual' or `auto'. - - - - - - The second line is the filename that the alternative will - provide. - - - - - - A list of zero or more slave links. For each slave there are - two lines: the first contains the name of the slave and the - second contains the filename. - - - - - - An empty line - - - - - - A list of one or more alternatives. Each alternative is made up - as follows: - - - - - - The filename of the file providing the alternative. - - - - - - The priority - - - - - - For each slave link a single line with the file providing - the link. An empty line can be used to indicate an - alternative does not provide a slave. - - - - - -
- - - - - diff --git a/doc/internals.sgml b/doc/internals.sgml deleted file mode 100644 index 53c99a6c..00000000 --- a/doc/internals.sgml +++ /dev/null @@ -1,544 +0,0 @@ - -%manuals-version-def; -]> - - - -dpkg Internals Manual - - Klee Dienes - klee@mit.edu - -Version &manuals-version; (dpkg &dpkg-version;) - -This manual describes the internal structure of the dpkg package -management system. - - - - -Copyright ©1997 Klee Dienes <klee@mit.edu> - -

-This manual is free software; you may 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 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 with -your Debian system, in /usr/share/common-licenses/GPL, or -with the dpkg source package as the file COPYING. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. - - - - - - -Build Notes - - Automake -

-This section by Tom Lees <tom@lpsg.demon.co.uk> on Tue, 4 Mar 1997 -21:34:57 +0000, with subsequent modifications by Klee Dienes <klee@debian.org> - -

-This chapter contains general notes about the conversion to -automake. If you plan on doing anything with dpkg, you -should probably read all of this file first. You have been warned. - -

-Automake has several significant advantages, including: - - -it supports emacs lisp properly -It supports libtool properly -it includes the aclocal utility - - -

-The aclocal utility is a very useful program which will automatically -build an aclocal.m4 file from the configure.in file to include the -appropriate macros. - -

-This doesn't affect anything other than rebuilding the Makefile.in files -from the sources. - -

-Probably the main difference which is noticable is that instead of -using proprietary directory names, it now supports configure ---sharedstatedir, and configure --localstatedir. To set these -to the Debian defaults, you should use ./configure ---localstatedir=/etc --sharedstatedir=/var/lib. - -

-I have also customized the canonicalizing macros found in -autoconf to include the old way of finding the dpkg -``architecture'', i.e. to be a bit more smart. Instead of it trying to -determine the architecture only, I changed it to use the `host', -`build', and `target' system types. The target CPU type is checked -against the archtable to find the architecture on which dpkg will run. - -

-It uses gcc --print-libgcc-file-name to find out the build -architecture if possible (used later to determine ELF or a.out -format), and also uses dpkg --print-architecture if possible to -modify the cpu field before it passes on the target alias to -config.sub. If you want to specify the architecture, you should now -use "--target=", rather than --with-arch, which was essentially -a hack anyway. The old -I also converted to libtool (which can be found in the Debian -distribution now). Essentially, this means that all the dpkg tools can -be compiled against a shared libdpkg without much hassle (in -fact, it is the default). You do not need to install libtool to use -this feature (it works like autoconf), and generally, it should not be -needed much at all. - -

-The new dist targets will build a distribution including all -files built by the debiandoc2html, debiandoc2ps, etc., -which are included in the distribution so that people may build dpkg -without these (especially useful to porters). - -

-A target -I removed the -I have added -automake -autoconf -aclocal -autoheader -gettextize -libtoolize - - -

-If you want to modify any of the sources, I recommend that you do the following -first (after having installed the appropriate utilities, of course):- - - - -make maintainer-clean - -aclocal - -autoheader - -autoconf - -gettextize - -libtoolize (do not let automake run this, as it will cause it not to -include the libtool files in the dist targets) - -for i in COPYING INSTALL; do ln -s /usr/share/automake/$i .; done - -automake - - -

-I have also incorporated the patches originally made by Galen -Hazelwood to internationalize dpkg using GNU gettext - see the file -"NOTES.intl" for more information about this. - -

-Other minor changes are: - - - -The version number is now determined from debian/changelog, not from -the directory name. - -Creation of version.h now handled from configure script, not Makefile. - -include/dpkg.h is now generated from include/dpkg.h.in by a sed -script, inserting the appropriate directory definitions - so now it -supports changing the dpkg directories (can install in /usr/local) - -Updated the COPYING (1 very minor change) and INSTALL files to those -distributed with automake-1.1l - -Since the shared libdpkg is now installed, I also made -include/Makefile install dpkg.h and dpkg-db.h into /usr/include by -default - - -Questions: - - - -Should I use - - - - -Internationalization - -

-This section by Galen Hazelwood. - -

-Dpkg is, to say the least, generous in its error reporting. The vast -majority of the output strings are error messages of one kind or another. -And if you feel that you've stumbled into the Department of Redundancy -Department, you would be absolutely correct. Many of the error messages -in dpkg.pot are duplicates, used at different points in the program. - -

-To avoid swamping the translators completely, I made some executive decisions -on what kinds of strings to translate. All the strings sent to debug() are -left alone, on the grounds that these are for dpkg developers, and not for -the general public. Most interal error messages were very cryptic, and -would probably confuse the translators when seen just sitting there in -the dpkg.pot file, and are also left alone. (I did mark some of the more -verbose ones for translation.) - -

-If others disagree with me about the necessity of translating these strings, -it's easy enough to just go through and mark them later. - -

-I added the startup gettext code to the main routine in dselect, which was -necessary as many of the strings in lib are translated. Dselect is otherwise -unchanged. - -

-Changes: - - - -The files in intl and po were taken from gettext 0.10.26, by way of -the gettextize program. I altered the makefiles to remove the VERSION -symbol, which is only used in targets which dpkg does not support. - -aclocal.m4 was stolen from the textutils package, configure.in was -altered to use these new tests, symbols were added to acconfig.h, and -the two new directories were added to Makefile.in. - -The dpkg, dpkg-deb, md5sum, split, and dselect Makefiles now look for -headers in ../intl, and try to link with whatever i18n libraries -configure finds. They also now define LOCALEDIR in CFLAGS. - -include/dpkg.h has the necessary NLS boilerplate, and the only file -which dosen't include this (md5sum/md5sum.c) had it added directly. - -The most intrusive change is due to a disagreement between xgettext -and the dpkg coding style. Although xgettext understands string -constant concatenation, it can't handle the case where preprocessor -symbols are used as well. The dpkg code uses this a lot, especially -in cases like this: - -ohshite("error reading from " BACKEND " pipe"); - -where BACKEND is defined as "dpkg-deb". Because xgettext can't handle -this, I have changed this usage in all cases to something like: - -ohshite(_("error reading from dpkg-deb pipe"); - -This isn't very kind to Ian, I know. But what can I do? - - - - - - - -Code Internals - - -Structure Definitons - - -versionrevision -

- -struct versionrevision { - unsigned long epoch; - char *version; - char *revision; -}; - - -

-The - - - - -Functions - - -Parsing translation tables -

-Each of these tables is used to associate a set of strings with a -corresponding set of integers. - -Current tables are: - -

- -const struct namevalue booleaninfos[]; - - -

-Maps boolean strings ( -priorityinfos[] - -

- -const struct namevalue priorityinfos[]; - - -

-Maps priority strings to and from values of -type - - - - - -statusinfos[] - -

- -const struct namevalue statusinfos[]; - - -Maps package status strings to values of type - - -eflaginfos[] - -

- -const struct namevalue eflaginfos[]; - - - - -wantinfos[] - -

- -const struct namevalue wantinfos[]; - - - - -nicknames[] - -

- -const struct nickname nicknames[]; - - -Maps obsolete control fields to their current versions. - - - - - - -Parsing functions - - -parseerr() - -

- -void parseerr -(FILE *file, const char *filename, int lno, - FILE *warnto, int *warncount, const struct pkginfo *pigp, - int warnonly, const char *fmt, ...); - - -Report an error parsing a control data stream. Checks - - -illegal_packagename() - -

- -const char *illegal_packagename -(const char *p, const char **ep) - - -Checks the package name at - - -informativeversion() - -

- -int informativeversion(const struct versionrevision *version) - - -

-Returns true if and only if the - - -varbufversion() - -

- -void varbufversion -(struct varbuf *vb, - const struct versionrevision *version, - enum versiondisplayepochwhen vdew); - - -Writes a human-readable representation of - - - - -versiondescribe() - -

- -const char *versiondescribe -(const struct versionrevision *version, - enum versiondisplayepochwhen vdew); - - -

-Return a human-readable representation of - - -parseversion() - -

- -const char *parseversion -(struct versionrevision *rversion, const char *string); - - -

-Parse the contents of - - -parsemustfield() - -

- -void parsemustfield -(FILE *file, const char *filename, int lno, - FILE *warnto, int *warncount, - const struct pkginfo *pigp, int warnonly, - char **value, const char *what); - - - - -skip_slash_dotslash() - -

- -const char *skip_slash_dotslash (const char *p); - - - - -convert_string() - -

- -static int convert_string -(const char *filename, int lno, const char *what, int otherwise, - FILE *warnto, int *warncount, const struct pkginfo *pigp, - const char *startp, const struct namevalue *nvip, - const char **endpp) - - - - - - - - diff --git a/dpkg-deb/Makefile b/dpkg-deb/Makefile deleted file mode 100644 index 2331bd7f..00000000 --- a/dpkg-deb/Makefile +++ /dev/null @@ -1,56 +0,0 @@ - - -srcdir = . -top_srcdir = .. -top_builddir = .. - - -default: all - -include ../Makefile.conf - - -SOURCES = build.c extract.c info.c main.c - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) dpkg-deb dpkg-deb-static - -.PHONY: all -all:: dpkg-deb -ifdef ALSO_STATIC -all:: dpkg-deb-static -endif - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - -$(RM) $(GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)$(bindir) - $(INSTALL) dpkg-deb $(DESTDIR)$(bindir) -ifdef ALSO_STATIC - $(INSTALL) dpkg-deb-static $(DESTDIR)$(bindir) -endif - -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - $(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir) - -dpkg-deb-static: LDFLAGS += -static -dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC) -dpkg-deb-static: BZ2LIB_LIBS = $(BZ2LIB_LIBS_ALSO_STATIC) -dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) - diff --git a/dpkg-deb/Makefile.am b/dpkg-deb/Makefile.am new file mode 100644 index 00000000..f2f8565d --- /dev/null +++ b/dpkg-deb/Makefile.am @@ -0,0 +1,19 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/lib \ + $(ZLIB_CFLAGS) $(BZ2_CFLAGS) + + +bin_PROGRAMS = dpkg-deb + +dpkg_deb_SOURCES = \ + dpkg-deb.h \ + build.c \ + extract.c \ + info.c \ + main.c + +dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) diff --git a/dpkg-deb/Makefile.in b/dpkg-deb/Makefile.in index 2219ce15..5988adfe 100644 --- a/dpkg-deb/Makefile.in +++ b/dpkg-deb/Makefile.in @@ -1,56 +1,490 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. +# 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. -default: all +@SET_MAKE@ -include ../Makefile.conf +SOURCES = $(dpkg_deb_SOURCES) +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +bin_PROGRAMS = dpkg-deb$(EXEEXT) +subdir = dpkg-deb +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_dpkg_deb_OBJECTS = build.$(OBJEXT) extract.$(OBJEXT) info.$(OBJEXT) \ + main.$(OBJEXT) +dpkg_deb_OBJECTS = $(am_dpkg_deb_OBJECTS) +am__DEPENDENCIES_1 = +dpkg_deb_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/build.Po ./$(DEPDIR)/extract.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/info.Po ./$(DEPDIR)/main.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(dpkg_deb_SOURCES) +DIST_SOURCES = $(dpkg_deb_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/lib \ + $(ZLIB_CFLAGS) $(BZ2_CFLAGS) -SOURCES = build.c extract.c info.c main.c +dpkg_deb_SOURCES = \ + dpkg-deb.h \ + build.c \ + extract.c \ + info.c \ + main.c -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) dpkg-deb dpkg-deb-static +dpkg_deb_LDADD = $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) +all: all-am -.PHONY: all -all:: dpkg-deb -ifdef ALSO_STATIC -all:: dpkg-deb-static -endif +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpkg-deb/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu dpkg-deb/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -.PHONY: install -install:: all +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -.PHONY: clean -clean:: - -$(RM) $(GENFILES) +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done -.PHONY: distclean -cvslean:: clean - $(RM) Makefile +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done -.PHONY: install -install:: install-program install-doc +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +dpkg-deb$(EXEEXT): $(dpkg_deb_OBJECTS) $(dpkg_deb_DEPENDENCIES) + @rm -f dpkg-deb$(EXEEXT) + $(LINK) $(dpkg_deb_LDFLAGS) $(dpkg_deb_OBJECTS) $(dpkg_deb_LDADD) $(LIBS) -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)$(bindir) - $(INSTALL) dpkg-deb $(DESTDIR)$(bindir) -ifdef ALSO_STATIC - $(INSTALL) dpkg-deb-static $(DESTDIR)$(bindir) -endif +mostlyclean-compile: + -rm -f *.$(OBJEXT) -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - $(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir) +distclean-compile: + -rm -f *.tab.c -dpkg-deb-static: LDFLAGS += -static -dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC) -dpkg-deb-static: BZ2LIB_LIBS = $(BZ2LIB_LIBS_ALSO_STATIC) -dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-binPROGRAMS + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + 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 pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS 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. +.NOEXPORT: diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index 243a0ea6..cffbda7e 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -36,7 +36,7 @@ #include #include #include -#ifdef USE_ZLIB +#ifdef WITH_ZLIB #include #endif diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index b5cf84b2..67846d93 100644 --- a/dpkg-deb/extract.c +++ b/dpkg-deb/extract.c @@ -34,7 +34,7 @@ #include #include #include -#ifdef USE_ZLIB +#ifdef WITH_ZLIB #include #endif diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c index 98bd400e..494acda2 100644 --- a/dpkg-deb/main.c +++ b/dpkg-deb/main.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "dpkg-deb.h" @@ -176,7 +176,6 @@ static void setcompresstype(const struct cmdinfo *cip, const char *value) { ohshit(_("unknown compression type `%s'!"), value); } -int main(int argc, const char *const *argv) NONRETURNING; int main(int argc, const char *const *argv) { jmp_buf ejbuf; diff --git a/dpkg-split/Makefile.am b/dpkg-split/Makefile.am new file mode 100644 index 00000000..09a700ca --- /dev/null +++ b/dpkg-split/Makefile.am @@ -0,0 +1,38 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \ + -I$(top_srcdir)/lib + + +bin_PROGRAMS = dpkg-split + +dpkg_split_SOURCES = \ + dpkg-split.h \ + info.c \ + join.c \ + main.c \ + queue.c \ + split.c + +dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a + + +pkglib_SCRIPTS = mksplit +EXTRA_DIST = mksplit.pl +CLEANFILES = $(pkglib_SCRIPTS) + + +do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" + + +%: %.pl Makefile + @test -d `dirname $@` || $(mkdir_p) `dirname $@` + $(do_perl_subst) <$< >$@ + chmod +x $@ + + +install-data-local: + $(mkdir_p) $(DESTDIR)$(admindir)/parts diff --git a/dpkg-split/Makefile.in b/dpkg-split/Makefile.in new file mode 100644 index 00000000..89dc012b --- /dev/null +++ b/dpkg-split/Makefile.in @@ -0,0 +1,530 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ + + +SOURCES = $(dpkg_split_SOURCES) + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +bin_PROGRAMS = dpkg-split$(EXEEXT) +subdir = dpkg-split +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_dpkg_split_OBJECTS = info.$(OBJEXT) join.$(OBJEXT) main.$(OBJEXT) \ + queue.$(OBJEXT) split.$(OBJEXT) +dpkg_split_OBJECTS = $(am_dpkg_split_OBJECTS) +am__DEPENDENCIES_1 = +dpkg_split_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a +pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(pkglib_SCRIPTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/info.Po ./$(DEPDIR)/join.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/queue.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/split.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(dpkg_split_SOURCES) +DIST_SOURCES = $(dpkg_split_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DADMINDIR=\"$(admindir)\" -DMKSPLITSCRIPT=\"$(pkglibdir)/mksplit\" \ + -I$(top_srcdir)/lib + +dpkg_split_SOURCES = \ + dpkg-split.h \ + info.c \ + join.c \ + main.c \ + queue.c \ + split.c + +dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a +pkglib_SCRIPTS = mksplit +EXTRA_DIST = mksplit.pl +CLEANFILES = $(pkglib_SCRIPTS) +do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpkg-split/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu dpkg-split/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +dpkg-split$(EXEEXT): $(dpkg_split_OBJECTS) $(dpkg_split_DEPENDENCIES) + @rm -f dpkg-split$(EXEEXT) + $(LINK) $(dpkg_split_LDFLAGS) $(dpkg_split_OBJECTS) $(dpkg_split_LDADD) $(LIBS) +install-pkglibSCRIPTS: $(pkglib_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" + @list='$(pkglib_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(pkglibSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(pkglibSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ + else :; fi; \ + done + +uninstall-pkglibSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(SCRIPTS) +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-exec-am: install-binPROGRAMS install-pkglibSCRIPTS + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-pkglibSCRIPTS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pkglibSCRIPTS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am \ + uninstall-pkglibSCRIPTS + + +%: %.pl Makefile + @test -d `dirname $@` || $(mkdir_p) `dirname $@` + $(do_perl_subst) <$< >$@ + chmod +x $@ + +install-data-local: + $(mkdir_p) $(DESTDIR)$(admindir)/parts +# 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/split/dpkg-split.h b/dpkg-split/dpkg-split.h similarity index 100% rename from split/dpkg-split.h rename to dpkg-split/dpkg-split.h diff --git a/split/info.c b/dpkg-split/info.c similarity index 100% rename from split/info.c rename to dpkg-split/info.c diff --git a/split/join.c b/dpkg-split/join.c similarity index 100% rename from split/join.c rename to dpkg-split/join.c diff --git a/split/main.c b/dpkg-split/main.c similarity index 98% rename from split/main.c rename to dpkg-split/main.c index 79ac1576..2da27b7b 100644 --- a/split/main.c +++ b/dpkg-split/main.c @@ -30,7 +30,6 @@ #include #include -#include #include #include "dpkg-split.h" @@ -149,7 +148,6 @@ static void setaction(const struct cmdinfo *cip, const char *value) { action= dofunctions[cip-cmdinfos]; } -int main(int argc, const char *const *argv) NONRETURNING; int main(int argc, const char *const *argv) { jmp_buf ejbuf; int l; diff --git a/split/mksplit.pl b/dpkg-split/mksplit.pl similarity index 100% rename from split/mksplit.pl rename to dpkg-split/mksplit.pl diff --git a/split/queue.c b/dpkg-split/queue.c similarity index 100% rename from split/queue.c rename to dpkg-split/queue.c diff --git a/split/split.c b/dpkg-split/split.c similarity index 100% rename from split/split.c rename to dpkg-split/split.c diff --git a/dselect/Makefile b/dselect/Makefile deleted file mode 100644 index 02783f4f..00000000 --- a/dselect/Makefile +++ /dev/null @@ -1,60 +0,0 @@ - -srcdir = . -top_srcdir = .. -top_builddir = .. - -default: all -include ../Makefile.conf - -CXX_SOURCES = basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \ - main.cc methkeys.cc methlist.cc method.cc methparse.cc \ - pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \ - pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc - -MAN8PAGES = dselect.8 - -OBJECTS = $(patsubst %.cc, %.o, $(CXX_SOURCES)) -GENFILES = $(OBJECTS) dselect curkeys.h - -.PHONY: all -all:: dselect - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) dselect $(DESTDIR)/$(bindir) - -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \ - done - -dselect: $(OBJECTS) ../lib/libdpkg.a - $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS) - -basecmds.o: helpmsgs.h -curkeys.o: curkeys.h - -curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl - cursesfile=`echo '#include ' | \ - $(CC) -E - | grep 'curses.h' | head -n 1 | \ - $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \ - if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \ - perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@ diff --git a/dselect/Makefile.am b/dselect/Makefile.am new file mode 100644 index 00000000..6fa7ec9c --- /dev/null +++ b/dselect/Makefile.am @@ -0,0 +1,48 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \ + -I$(top_srcdir)/lib + + +bin_PROGRAMS = dselect + +dselect_SOURCES = \ + dselect.h \ + basecmds.cc \ + baselist.cc \ + basetop.cc \ + bindings.cc bindings.h \ + curkeys.cc \ + helpmsgs.cc helpmsgs.h \ + main.cc \ + methkeys.cc \ + methlist.cc \ + method.cc method.h \ + methparse.cc \ + pkgcmds.cc \ + pkgdepcon.cc \ + pkgdisplay.cc \ + pkginfo.cc \ + pkgkeys.cc \ + pkglist.cc pkglist.h \ + pkgsublist.cc \ + pkgtop.cc + +dselect_LDADD = $(LIBINTL) ../lib/libdpkg.a $(CURSES_LIBS) + + +EXTRA_DIST = keyoverride mkcurkeys.pl +CLEANFILES = curkeys.h + +curkeys.$(OBJEXT): curkeys.h +curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl + cursesfile=`echo '#include ' | \ + $(CC) -E - | grep 'curses.h' | head -n 1 | \ + sed -e 's/^[^"]*"//; s/".*$$//'`; \ + if [ "$$cursesfile" = "" ]; then \ + echo "can't find curses file"; exit 1; \ + fi; \ + perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@ diff --git a/dselect/Makefile.in b/dselect/Makefile.in index fbacabeb..b39db09c 100644 --- a/dselect/Makefile.in +++ b/dselect/Makefile.in @@ -1,60 +1,551 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -CXX_SOURCES = basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \ - main.cc methkeys.cc methlist.cc method.cc methparse.cc \ - pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \ - pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc +# 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. -MAN8PAGES = dselect.8 +@SET_MAKE@ -OBJECTS = $(patsubst %.cc, %.o, $(CXX_SOURCES)) -GENFILES = $(OBJECTS) dselect curkeys.h +SOURCES = $(dselect_SOURCES) -.PHONY: all -all:: dselect +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +bin_PROGRAMS = dselect$(EXEEXT) +subdir = dselect +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_dselect_OBJECTS = basecmds.$(OBJEXT) baselist.$(OBJEXT) \ + basetop.$(OBJEXT) bindings.$(OBJEXT) curkeys.$(OBJEXT) \ + helpmsgs.$(OBJEXT) main.$(OBJEXT) methkeys.$(OBJEXT) \ + methlist.$(OBJEXT) method.$(OBJEXT) methparse.$(OBJEXT) \ + pkgcmds.$(OBJEXT) pkgdepcon.$(OBJEXT) pkgdisplay.$(OBJEXT) \ + pkginfo.$(OBJEXT) pkgkeys.$(OBJEXT) pkglist.$(OBJEXT) \ + pkgsublist.$(OBJEXT) pkgtop.$(OBJEXT) +dselect_OBJECTS = $(am_dselect_OBJECTS) +am__DEPENDENCIES_1 = +dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a \ + $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/basecmds.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/baselist.Po ./$(DEPDIR)/basetop.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/bindings.Po ./$(DEPDIR)/curkeys.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/helpmsgs.Po ./$(DEPDIR)/main.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/methkeys.Po ./$(DEPDIR)/methlist.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/method.Po ./$(DEPDIR)/methparse.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pkgcmds.Po ./$(DEPDIR)/pkgdepcon.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pkgdisplay.Po ./$(DEPDIR)/pkginfo.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pkgkeys.Po ./$(DEPDIR)/pkglist.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pkgsublist.Po ./$(DEPDIR)/pkgtop.Po +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(dselect_SOURCES) +DIST_SOURCES = $(dselect_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \ + -I$(top_srcdir)/lib -.PHONY: install -install:: all +dselect_SOURCES = \ + dselect.h \ + basecmds.cc \ + baselist.cc \ + basetop.cc \ + bindings.cc bindings.h \ + curkeys.cc \ + helpmsgs.cc helpmsgs.h \ + main.cc \ + methkeys.cc \ + methlist.cc \ + method.cc method.h \ + methparse.cc \ + pkgcmds.cc \ + pkgdepcon.cc \ + pkgdisplay.cc \ + pkginfo.cc \ + pkgkeys.cc \ + pkglist.cc pkglist.h \ + pkgsublist.cc \ + pkgtop.cc -.PHONY: clean -clean:: - $(RM) $(GENFILES) +dselect_LDADD = $(LIBINTL) ../lib/libdpkg.a $(CURSES_LIBS) +EXTRA_DIST = keyoverride mkcurkeys.pl +CLEANFILES = curkeys.h +all: all-am -.PHONY: distclean -cvslean:: clean - $(RM) Makefile +.SUFFIXES: +.SUFFIXES: .cc .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dselect/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu dselect/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -.PHONY: install -install:: install-program install-doc +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) dselect $(DESTDIR)/$(bindir) +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +dselect$(EXEEXT): $(dselect_OBJECTS) $(dselect_DEPENDENCIES) + @rm -f dselect$(EXEEXT) + $(CXXLINK) $(dselect_LDFLAGS) $(dselect_OBJECTS) $(dselect_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basecmds.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/baselist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basetop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bindings.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curkeys.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpmsgs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methkeys.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methlist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/method.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/methparse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgcmds.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdepcon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgdisplay.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkginfo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgkeys.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkglist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgsublist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkgtop.Po@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-binPROGRAMS + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am -dselect: $(OBJECTS) ../lib/libdpkg.a - $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS) +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + 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 pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am -basecmds.o: helpmsgs.h -curkeys.o: curkeys.h -curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl +curkeys.$(OBJEXT): curkeys.h +curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl cursesfile=`echo '#include ' | \ - $(CC) -E - | grep 'curses.h' | head -n 1 | \ - $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \ - if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \ - perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@ + $(CC) -E - | grep 'curses.h' | head -n 1 | \ + sed -e 's/^[^"]*"//; s/".*$$//'`; \ + if [ "$$cursesfile" = "" ]; then \ + echo "can't find curses file"; exit 1; \ + fi; \ + perl $(srcdir)/mkcurkeys.pl $< $$cursesfile >$@ +# 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/dselect/checkunimp.pl b/dselect/checkunimp.pl deleted file mode 100755 index c0b723bc..00000000 --- a/dselect/checkunimp.pl +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/perl -while(<>) { - if (m/^\s+\{\s+\"(\w[^"]+)\",\s+0,\s+\w+list\:\:kd_\w+,\s+qa_\w+\s+\},\s*$/ || - m/^\s+\{\s+\"(\w[^"]+)\",\s+\w+list\:\:kd_\w+,\s+0,\s+qa_\w+\s+\},\s*$/) { - $implem{$1}= 1; - } elsif (m/^\s+\{\s+(\S.{0,15}\S),\s+\"(\w[^"]+)\"\s+\},\s*$/) { - $bound{$2} .= $1.', '; - } elsif (m/^\s+\{\s+0,/ || m/^\s+\{\s+-1,/) { - } elsif (m/^\s+\{\s+/) { - print "huh ? $_"; - } -} -for $f (sort keys %bound) { - next if defined($implem{$f}); - $b=$bound{$f}; $b =~ s/, $//; - printf "unimplemented: %-20s (%s)\n", $f, $b; -} diff --git a/dselect/keys.c b/dselect/keys.c deleted file mode 100644 index 92dd16a4..00000000 --- a/dselect/keys.c +++ /dev/null @@ -1,91 +0,0 @@ -{ KEY_MIN , "MIN" }, -{ KEY_BREAK , "BREAK" }, -{ KEY_DOWN , "DOWN" }, -{ KEY_UP , "UP" }, -{ KEY_LEFT , "LEFT" }, -{ KEY_RIGHT , "RIGHT" }, -{ KEY_HOME , "HOME" }, -{ KEY_BACKSPACE , "BACKSPACE" }, -{ KEY_F0 , "F0" }, -{ KEY_DL , "DL" }, -{ KEY_IL , "IL" }, -{ KEY_DC , "DC" }, -{ KEY_IC , "IC" }, -{ KEY_EIC , "EIC" }, -{ KEY_CLEAR , "CLEAR" }, -{ KEY_EOS , "EOS" }, -{ KEY_EOL , "EOL" }, -{ KEY_SF , "SF" }, -{ KEY_SR , "SR" }, -{ KEY_NPAGE , "NPAGE" }, -{ KEY_PPAGE , "PPAGE" }, -{ KEY_STAB , "STAB" }, -{ KEY_CTAB , "CTAB" }, -{ KEY_CATAB , "CATAB" }, -{ KEY_ENTER , "ENTER" }, -{ KEY_SRESET , "SRESET" }, -{ KEY_RESET , "RESET" }, -{ KEY_PRINT , "PRINT" }, -{ KEY_LL , "LL" }, -{ KEY_A1 , "A1" }, -{ KEY_A3 , "A3" }, -{ KEY_B2 , "B2" }, -{ KEY_C1 , "C1" }, -{ KEY_C3 , "C3" }, -{ KEY_BTAB , "BTAB" }, -{ KEY_BEG , "BEG" }, -{ KEY_CANCEL , "CANCEL" }, -{ KEY_CLOSE , "CLOSE" }, -{ KEY_COMMAND , "COMMAND" }, -{ KEY_COPY , "COPY" }, -{ KEY_CREATE , "CREATE" }, -{ KEY_END , "END" }, -{ KEY_EXIT , "EXIT" }, -{ KEY_FIND , "FIND" }, -{ KEY_HELP , "HELP" }, -{ KEY_MARK , "MARK" }, -{ KEY_MESSAGE , "MESSAGE" }, -{ KEY_MOVE , "MOVE" }, -{ KEY_NEXT , "NEXT" }, -{ KEY_OPEN , "OPEN" }, -{ KEY_OPTIONS , "OPTIONS" }, -{ KEY_PREVIOUS , "PREVIOUS" }, -{ KEY_REDO , "REDO" }, -{ KEY_REFERENCE , "REFERENCE" }, -{ KEY_REFRESH , "REFRESH" }, -{ KEY_REPLACE , "REPLACE" }, -{ KEY_RESTART , "RESTART" }, -{ KEY_RESUME , "RESUME" }, -{ KEY_SAVE , "SAVE" }, -{ KEY_SBEG , "SBEG" }, -{ KEY_SCANCEL , "SCANCEL" }, -{ KEY_SCOMMAND , "SCOMMAND" }, -{ KEY_SCOPY , "SCOPY" }, -{ KEY_SCREATE , "SCREATE" }, -{ KEY_SDC , "SDC" }, -{ KEY_SDL , "SDL" }, -{ KEY_SELECT , "SELECT" }, -{ KEY_SEND , "SEND" }, -{ KEY_SEOL , "SEOL" }, -{ KEY_SEXIT , "SEXIT" }, -{ KEY_SFIND , "SFIND" }, -{ KEY_SHELP , "SHELP" }, -{ KEY_SHOME , "SHOME" }, -{ KEY_SIC , "SIC" }, -{ KEY_SLEFT , "SLEFT" }, -{ KEY_SMESSAGE , "SMESSAGE" }, -{ KEY_SMOVE , "SMOVE" }, -{ KEY_SNEXT , "SNEXT" }, -{ KEY_SOPTIONS , "SOPTIONS" }, -{ KEY_SPREVIOUS , "SPREVIOUS" }, -{ KEY_SPRINT , "SPRINT" }, -{ KEY_SREDO , "SREDO" }, -{ KEY_SREPLACE , "SREPLACE" }, -{ KEY_SRIGHT , "SRIGHT" }, -{ KEY_SRSUME , "SRSUME" }, -{ KEY_SSAVE , "SSAVE" }, -{ KEY_SSUSPEND , "SSUSPEND" }, -{ KEY_SUNDO , "SUNDO" }, -{ KEY_SUSPEND , "SUSPEND" }, -{ KEY_UNDO , "UNDO" }, -{ KEY_MAX , "MAX" }, diff --git a/dselect/main.cc b/dselect/main.cc index dcd93d45..021fb6e5 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -41,7 +41,6 @@ extern "C" { extern "C" { #include #include -#include #include } #include "dselect.h" diff --git a/getopt/Makefile.am b/getopt/Makefile.am new file mode 100644 index 00000000..f169faf4 --- /dev/null +++ b/getopt/Makefile.am @@ -0,0 +1,17 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/lib + + +noinst_LIBRARIES = libopt.a + +libopt_a_SOURCES = \ + closeout.c closeout.h \ + error.h \ + getopt.c getopt.h \ + getopt1.c \ + long-options.c long-options.h \ + obstack.c obstack.h diff --git a/getopt/Makefile.in b/getopt/Makefile.in new file mode 100644 index 00000000..96e42c03 --- /dev/null +++ b/getopt/Makefile.in @@ -0,0 +1,468 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ + +SOURCES = $(libopt_a_SOURCES) + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = getopt +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libopt_a_AR = $(AR) $(ARFLAGS) +libopt_a_LIBADD = +am_libopt_a_OBJECTS = closeout.$(OBJEXT) getopt.$(OBJEXT) \ + getopt1.$(OBJEXT) long-options.$(OBJEXT) obstack.$(OBJEXT) +libopt_a_OBJECTS = $(am_libopt_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/closeout.Po ./$(DEPDIR)/getopt.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/long-options.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/obstack.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libopt_a_SOURCES) +DIST_SOURCES = $(libopt_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/lib + +noinst_LIBRARIES = libopt.a +libopt_a_SOURCES = \ + closeout.c closeout.h \ + error.h \ + getopt.c getopt.h \ + getopt1.c \ + long-options.c long-options.h \ + obstack.c obstack.h + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu getopt/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu getopt/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libopt.a: $(libopt_a_OBJECTS) $(libopt_a_DEPENDENCIES) + -rm -f libopt.a + $(libopt_a_AR) libopt.a $(libopt_a_OBJECTS) $(libopt_a_LIBADD) + $(RANLIB) libopt.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +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 -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-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 pdf pdf-am ps ps-am 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. +.NOEXPORT: diff --git a/optlib/closeout.c b/getopt/closeout.c similarity index 100% rename from optlib/closeout.c rename to getopt/closeout.c diff --git a/optlib/closeout.h b/getopt/closeout.h similarity index 100% rename from optlib/closeout.h rename to getopt/closeout.h diff --git a/optlib/error.h b/getopt/error.h similarity index 95% rename from optlib/error.h rename to getopt/error.h index d816fde1..b7150557 100644 --- a/optlib/error.h +++ b/getopt/error.h @@ -32,12 +32,10 @@ extern "C" { if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ -extern void error (int status, int errnum, const char *format, ...) - PRINTFFORMAT(3, 4); +extern void error (int status, int errnum, const char *format, ...); extern void error_at_line (int status, int errnum, const char *fname, - unsigned int lineno, const char *format, ...) - PRINTFFORMAT(5, 6); + unsigned int lineno, const char *format, ...); /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this diff --git a/optlib/getopt.c b/getopt/getopt.c similarity index 99% rename from optlib/getopt.c rename to getopt/getopt.c index ea2d1ff5..0a3a47e4 100644 --- a/optlib/getopt.c +++ b/getopt/getopt.c @@ -270,7 +270,6 @@ extern pid_t __libc_pid; is valid for the getopt call we must make sure that the ARGV passed to getopt is that one passed to the process. */ static void -UNUSED store_args_and_env (int argc, char *const *argv) { /* XXX This is no good solution. We should rather copy the args so diff --git a/optlib/getopt.h b/getopt/getopt.h similarity index 100% rename from optlib/getopt.h rename to getopt/getopt.h diff --git a/optlib/getopt1.c b/getopt/getopt1.c similarity index 100% rename from optlib/getopt1.c rename to getopt/getopt1.c diff --git a/optlib/long-options.c b/getopt/long-options.c similarity index 100% rename from optlib/long-options.c rename to getopt/long-options.c diff --git a/optlib/long-options.h b/getopt/long-options.h similarity index 100% rename from optlib/long-options.h rename to getopt/long-options.h diff --git a/optlib/obstack.c b/getopt/obstack.c similarity index 100% rename from optlib/obstack.c rename to getopt/obstack.c diff --git a/optlib/obstack.h b/getopt/obstack.h similarity index 100% rename from optlib/obstack.h rename to getopt/obstack.h diff --git a/include/Makefile b/include/Makefile deleted file mode 100644 index 7ffd5f2f..00000000 --- a/include/Makefile +++ /dev/null @@ -1,25 +0,0 @@ - - -srcdir = . - -GENFILES = dpkg.h - -default: all -include ../Makefile.conf - -all:: $(GENFILES) - -install:: all - -clean:: - rm -f $(GENFILES) - -cvslean:: clean - rm -f Makefile - -dpkg.h: dpkg.h.in - sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \ - -e 's,#ADMINDIR#,$(admindir),' \ - -e 's,#LIBDIR#,$(dpkglibdir),' $< > $@ - -.PHONY: all install clean distclean diff --git a/include/Makefile.in b/include/Makefile.in deleted file mode 100644 index ead2b585..00000000 --- a/include/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ - -VPATH = @srcdir@ -srcdir = @srcdir@ - -GENFILES = dpkg.h - -default: all -include ../Makefile.conf - -all:: $(GENFILES) - -install:: all - -clean:: - rm -f $(GENFILES) - -cvslean:: clean - rm -f Makefile - -dpkg.h: dpkg.h.in - sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \ - -e 's,#ADMINDIR#,$(admindir),' \ - -e 's,#LIBDIR#,$(dpkglibdir),' $< > $@ - -.PHONY: all install clean distclean diff --git a/install-sh b/install-sh index e9de2384..e4160c99 100755 --- a/install-sh +++ b/install-sh @@ -1,19 +1,38 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2004-04-01.17 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: # -# Copyright 1991 by the Massachusetts Institute of Technology +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# 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. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -23,13 +42,11 @@ # 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 # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -41,211 +58,268 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" +transformbasename= +transform_arg= instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac +src= +dst= +dir_arg= + +usage="Usage: $0 [OPTION]... SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 -d DIRECTORIES... + +In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. +In the second, create the directory path DIR. + +Options: +-b=TRANSFORMBASENAME +-c copy source (using $cpprog) instead of moving (using $mvprog). +-d create directories instead of installing files. +-g GROUP $chgrp installed files to GROUP. +-m MODE $chmod installed files to MODE. +-o USER $chown installed files to USER. +-s strip installed files (using $stripprog). +-t=TRANSFORM +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + -c) instcmd=$cpprog + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + --version) echo "$0 $scriptversion"; exit 0;; + + *) # When -d is used, all remaining arguments are directories to create. + test -n "$dir_arg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + instcmd=: + chmodcmd= + else + instcmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$instcmd $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - pathcomp="${pathcomp}/" + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" || lasterr=$? + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $instcmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + # If we're going to rename the final executable, determine the name now. + if test -z "$transformarg"; then + dstfile=`basename "$dst"` + else + dstfile=`basename "$dst" $transformbasename \ + | sed $transformarg`$transformbasename + fi + + # don't allow the sed command to completely eliminate the filename. + test -z "$dstfile" && dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Move or copy the file name to the temp name + $doit $instcmd "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $instcmd $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - -exit 0 +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/intl/ChangeLog b/intl/ChangeLog new file mode 100644 index 00000000..75129192 --- /dev/null +++ b/intl/ChangeLog @@ -0,0 +1,4 @@ +2004-01-29 GNU + + * Version 0.14.1 released. + diff --git a/intl/Makefile.in b/intl/Makefile.in new file mode 100644 index 00000000..05f15329 --- /dev/null +++ b/intl/Makefile.in @@ -0,0 +1,493 @@ +# Makefile for directory with message catalog handling library of GNU gettext +# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# 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. + +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = .. +VPATH = $(srcdir) + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +transform = @program_transform_name@ +libdir = @libdir@ +includedir = @includedir@ +datadir = @datadir@ +localedir = $(datadir)/locale +gettextsrcdir = $(datadir)/gettext/intl +aliaspath = $(localedir) +subdir = intl + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + +l = @INTL_LIBTOOL_SUFFIX_PREFIX@ + +AR = ar +CC = @CC@ +LIBTOOL = @LIBTOOL@ +RANLIB = @RANLIB@ +YACC = @INTLBISON@ -y -d +YFLAGS = --name-prefix=__gettext + +DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ +-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \ +-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ +-Dset_relocation_prefix=libintl_set_relocation_prefix \ +-Drelocate=libintl_relocate \ +-DDEPENDS_ON_LIBICONV=1 @DEFS@ +CPPFLAGS = @CPPFLAGS@ +CFLAGS = @CFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +HEADERS = \ + gmo.h \ + gettextP.h \ + hash-string.h \ + loadinfo.h \ + plural-exp.h \ + eval-plural.h \ + localcharset.h \ + relocatable.h \ + xsize.h \ + printf-args.h printf-args.c \ + printf-parse.h wprintf-parse.h printf-parse.c \ + vasnprintf.h vasnwprintf.h vasnprintf.c \ + os2compat.h \ + libgnuintl.h.in +SOURCES = \ + bindtextdom.c \ + dcgettext.c \ + dgettext.c \ + gettext.c \ + finddomain.c \ + loadmsgcat.c \ + localealias.c \ + textdomain.c \ + l10nflist.c \ + explodename.c \ + dcigettext.c \ + dcngettext.c \ + dngettext.c \ + ngettext.c \ + plural.y \ + plural-exp.c \ + localcharset.c \ + relocatable.c \ + localename.c \ + log.c \ + printf.c \ + osdep.c \ + os2compat.c \ + intl-compat.c +OBJECTS = \ + bindtextdom.$lo \ + dcgettext.$lo \ + dgettext.$lo \ + gettext.$lo \ + finddomain.$lo \ + loadmsgcat.$lo \ + localealias.$lo \ + textdomain.$lo \ + l10nflist.$lo \ + explodename.$lo \ + dcigettext.$lo \ + dcngettext.$lo \ + dngettext.$lo \ + ngettext.$lo \ + plural.$lo \ + plural-exp.$lo \ + localcharset.$lo \ + relocatable.$lo \ + localename.$lo \ + log.$lo \ + printf.$lo \ + osdep.$lo \ + intl-compat.$lo +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 = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \ +libgnuintl.h_vms Makefile.vms \ +libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc +DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ +COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h + +all: all-@USE_INCLUDED_LIBINTL@ +all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +all-no: all-no-@BUILD_INCLUDED_LIBINTL@ +all-no-yes: libgnuintl.$la +all-no-no: + +libintl.a libgnuintl.a: $(OBJECTS) + rm -f $@ + $(AR) cru $@ $(OBJECTS) + $(RANLIB) $@ + +libintl.la libgnuintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link \ + $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ + $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \ + -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ + -rpath $(libdir) \ + -no-undefined + +# Libtool's library version information for libintl. +# Before making a gettext release, the gettext maintainer must change this +# according to the libtool documentation, section "Library interface versions". +# Maintainers of other packages that include the intl directory must *not* +# change these values. +LTV_CURRENT=7 +LTV_REVISION=0 +LTV_AGE=4 + +.SUFFIXES: +.SUFFIXES: .c .y .o .lo .sin .sed + +.c.o: + $(COMPILE) $< + +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h + +bindtextdom.lo: $(srcdir)/bindtextdom.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c +dcgettext.lo: $(srcdir)/dcgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c +dgettext.lo: $(srcdir)/dgettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c +gettext.lo: $(srcdir)/gettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c +finddomain.lo: $(srcdir)/finddomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c +loadmsgcat.lo: $(srcdir)/loadmsgcat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c +localealias.lo: $(srcdir)/localealias.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c +textdomain.lo: $(srcdir)/textdomain.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c +l10nflist.lo: $(srcdir)/l10nflist.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c +explodename.lo: $(srcdir)/explodename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c +dcigettext.lo: $(srcdir)/dcigettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c +dcngettext.lo: $(srcdir)/dcngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c +dngettext.lo: $(srcdir)/dngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c +ngettext.lo: $(srcdir)/ngettext.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c +plural.lo: $(srcdir)/plural.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c +plural-exp.lo: $(srcdir)/plural-exp.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c +localcharset.lo: $(srcdir)/localcharset.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c +relocatable.lo: $(srcdir)/relocatable.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c +localename.lo: $(srcdir)/localename.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c +log.lo: $(srcdir)/log.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c +printf.lo: $(srcdir)/printf.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c +osdep.lo: $(srcdir)/osdep.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c +intl-compat.lo: $(srcdir)/intl-compat.c + $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c + +ref-add.sed: $(srcdir)/ref-add.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed + mv t-ref-add.sed ref-add.sed +ref-del.sed: $(srcdir)/ref-del.sin + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed + mv t-ref-del.sed ref-del.sed + +INCLUDES = -I. -I$(srcdir) -I.. + +libgnuintl.h: $(srcdir)/libgnuintl.h.in + sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ + -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ + -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ + -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ + < $(srcdir)/libgnuintl.h.in > libgnuintl.h + +libintl.h: libgnuintl.h + cp libgnuintl.h libintl.h + +charset.alias: $(srcdir)/config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ + mv t-$@ $@ + +check: all + +# We must not install the libintl.h/libintl.a files if we are on a +# system which has the GNU gettext() function in its C library or in a +# separate library. +# If you want to use the one which comes with this version of the +# package, you have to use `configure --with-included-gettext'. +install: install-exec install-data +install-exec: all + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + if test "@RELOCATABLE@" = yes; then \ + dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \ + if test -n "$$dependencies"; then \ + rm -f $(DESTDIR)$(libdir)/libintl.la; \ + fi; \ + fi; \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + orig=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + else \ + if test @GLIBC21@ = no; then \ + orig=charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + fi; \ + fi; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ + || orig=$(srcdir)/locale.alias; \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + else \ + : ; \ + fi +install-data: all + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ + $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ + dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ + for file in $$dists; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ + dists="$(DISTFILES.generated)"; \ + for file in $$dists; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + dists="$(DISTFILES.obsolete)"; \ + for file in $$dists; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi + +install-strip: install + +installdirs: + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir); \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ + rm -f $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools" \ + && test '@USE_INCLUDED_LIBINTL@' = no; then \ + rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + if test -f $(DESTDIR)$(localedir)/locale.alias; then \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi + +info dvi ps pdf html: + +$(OBJECTS): ../config.h libgnuintl.h +bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h +dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h +explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h +dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h +dcigettext.$lo: $(srcdir)/eval-plural.h +localcharset.$lo: $(srcdir)/localcharset.h +localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h +printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c + +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) + +ctags: CTAGS + +CTAGS: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES) + +id: ID + +ID: $(HEADERS) $(SOURCES) + here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) + + +mostlyclean: + rm -f *.a *.la *.o *.obj *.lo core core.* + rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed + rm -f -r .libs _libs + +clean: mostlyclean + +distclean: clean + rm -f Makefile ID TAGS + if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ + rm -f ChangeLog.inst $(DISTFILES.normal); \ + else \ + : ; \ + fi + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + + +# GNU gettext needs not contain the file `VERSION' but contains some +# other files which should not be distributed in other packages. +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: Makefile + if test "$(PACKAGE)" = "gettext-tools"; then \ + : ; \ + else \ + if test "$(PACKAGE)" = "gettext-runtime"; then \ + additional="$(DISTFILES.gettext)"; \ + else \ + additional="$(DISTFILES.normal)"; \ + fi; \ + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ + done; \ + fi + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status +# This would be more efficient, but doesn't work any more with autoconf-2.57, +# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. +# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/intl/VERSION b/intl/VERSION new file mode 100644 index 00000000..b4b846ca --- /dev/null +++ b/intl/VERSION @@ -0,0 +1 @@ +GNU gettext library from gettext-0.14.1 diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c new file mode 100644 index 00000000..dcdc4008 --- /dev/null +++ b/intl/bindtextdom.c @@ -0,0 +1,363 @@ +/* Implementation of the bindtextdomain(3) function + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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 +#endif + +#include +#include +#include + +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif +#include "gettextP.h" + +#ifdef _LIBC +/* We have to handle multi-threaded applications. */ +# include +#else +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_dirname libintl_nl_default_dirname +# define _nl_domain_bindings libintl_nl_domain_bindings +#endif + +/* Some compilers, like SunOS4 cc, don't have offsetof in . */ +#ifndef offsetof +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) +#endif + +/* @@ end of prolog @@ */ + +/* Contains the default location of the message catalogs. */ +extern const char _nl_default_dirname[]; +#ifdef _LIBC +extern const char _nl_default_dirname_internal[] attribute_hidden; +#else +# define INTUSE(name) name +#endif + +/* List with bindings of specific domains. */ +extern struct binding *_nl_domain_bindings; + +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden) + + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define BINDTEXTDOMAIN __bindtextdomain +# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset +# ifndef strdup +# define strdup(str) __strdup (str) +# endif +#else +# define BINDTEXTDOMAIN libintl_bindtextdomain +# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset +#endif + +/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP + to be used for the DOMAINNAME message catalog. + If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not + modified, only the current value is returned. + If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither + modified nor returned. */ +static void +set_binding_values (const char *domainname, + const char **dirnamep, const char **codesetp) +{ + struct binding *binding; + int modified; + + /* Some sanity checks. */ + if (domainname == NULL || domainname[0] == '\0') + { + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + return; + } + + __libc_rwlock_wrlock (_nl_state_lock); + + modified = 0; + + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (binding != NULL) + { + if (dirnamep) + { + const char *dirname = *dirnamep; + + if (dirname == NULL) + /* The current binding has be to returned. */ + *dirnamep = binding->dirname; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->dirname; + if (strcmp (dirname, result) != 0) + { + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0) + result = (char *) INTUSE(_nl_default_dirname); + else + { +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (dirname); +#else + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, dirname, len); +#endif + } + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->dirname != INTUSE(_nl_default_dirname)) + free (binding->dirname); + + binding->dirname = result; + modified = 1; + } + } + *dirnamep = result; + } + } + + if (codesetp) + { + const char *codeset = *codesetp; + + if (codeset == NULL) + /* The current binding has be to returned. */ + *codesetp = binding->codeset; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->codeset; + if (result == NULL || strcmp (codeset, result) != 0) + { +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (codeset); +#else + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, codeset, len); +#endif + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->codeset != NULL) + free (binding->codeset); + + binding->codeset = result; + binding->codeset_cntr++; + modified = 1; + } + } + *codesetp = result; + } + } + } + else if ((dirnamep == NULL || *dirnamep == NULL) + && (codesetp == NULL || *codesetp == NULL)) + { + /* Simply return the default values. */ + if (dirnamep) + *dirnamep = INTUSE(_nl_default_dirname); + if (codesetp) + *codesetp = NULL; + } + else + { + /* We have to create a new binding. */ + size_t len = strlen (domainname) + 1; + struct binding *new_binding = + (struct binding *) malloc (offsetof (struct binding, domainname) + len); + + if (__builtin_expect (new_binding == NULL, 0)) + goto failed; + + memcpy (new_binding->domainname, domainname, len); + + if (dirnamep) + { + const char *dirname = *dirnamep; + + if (dirname == NULL) + /* The default value. */ + dirname = INTUSE(_nl_default_dirname); + else + { + if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0) + dirname = INTUSE(_nl_default_dirname); + else + { + char *result; +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (dirname); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; +#else + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; + memcpy (result, dirname, len); +#endif + dirname = result; + } + } + *dirnamep = dirname; + new_binding->dirname = (char *) dirname; + } + else + /* The default value. */ + new_binding->dirname = (char *) INTUSE(_nl_default_dirname); + + new_binding->codeset_cntr = 0; + + if (codesetp) + { + const char *codeset = *codesetp; + + if (codeset != NULL) + { + char *result; + +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (codeset); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; +#else + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; + memcpy (result, codeset, len); +#endif + codeset = result; + new_binding->codeset_cntr++; + } + *codesetp = codeset; + new_binding->codeset = (char *) codeset; + } + else + new_binding->codeset = NULL; + + /* Now enqueue it. */ + if (_nl_domain_bindings == NULL + || strcmp (domainname, _nl_domain_bindings->domainname) < 0) + { + new_binding->next = _nl_domain_bindings; + _nl_domain_bindings = new_binding; + } + else + { + binding = _nl_domain_bindings; + while (binding->next != NULL + && strcmp (domainname, binding->next->domainname) > 0) + binding = binding->next; + + new_binding->next = binding->next; + binding->next = new_binding; + } + + modified = 1; + + /* Here we deal with memory allocation failures. */ + if (0) + { + failed_codeset: + if (new_binding->dirname != INTUSE(_nl_default_dirname)) + free (new_binding->dirname); + failed_dirname: + free (new_binding); + failed: + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + } + } + + /* If we modified any binding, we flush the caches. */ + if (modified) + ++_nl_msg_cat_cntr; + + __libc_rwlock_unlock (_nl_state_lock); +} + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +char * +BINDTEXTDOMAIN (const char *domainname, const char *dirname) +{ + set_binding_values (domainname, &dirname, NULL); + return (char *) dirname; +} + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +char * +BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset) +{ + set_binding_values (domainname, NULL, &codeset); + return (char *) codeset; +} + +#ifdef _LIBC +/* Aliases for function names in GNU C Library. */ +weak_alias (__bindtextdomain, bindtextdomain); +weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); +#endif diff --git a/intl/config.charset b/intl/config.charset new file mode 100755 index 00000000..43d45fb7 --- /dev/null +++ b/intl/config.charset @@ -0,0 +1,608 @@ +#! /bin/sh +# Output a system dependent table of character encoding aliases. +# +# Copyright (C) 2000-2004 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# 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. +# +# The table consists of lines of the form +# ALIAS CANONICAL +# +# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". +# ALIAS is compared in a case sensitive way. +# +# CANONICAL is the GNU canonical name for this character encoding. +# It must be an encoding supported by libiconv. Support by GNU libc is +# also desirable. CANONICAL is case insensitive. Usually an upper case +# MIME charset name is preferred. +# The current list of GNU canonical charset names is as follows. +# +# name MIME? used by which systems +# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin +# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-3 Y glibc solaris +# ISO-8859-4 Y osf solaris freebsd darwin +# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-6 Y glibc aix hpux solaris +# ISO-8859-7 Y glibc aix hpux irix osf solaris +# ISO-8859-8 Y glibc aix hpux osf solaris +# ISO-8859-9 Y glibc aix hpux irix osf solaris +# ISO-8859-13 glibc +# ISO-8859-14 glibc +# ISO-8859-15 glibc aix osf solaris freebsd +# KOI8-R Y glibc solaris freebsd darwin +# KOI8-U Y glibc freebsd darwin +# KOI8-T glibc +# CP437 dos +# CP775 dos +# CP850 aix osf dos +# CP852 dos +# CP855 dos +# CP856 aix +# CP857 dos +# CP861 dos +# CP862 dos +# CP864 dos +# CP865 dos +# CP866 freebsd darwin dos +# CP869 dos +# CP874 woe32 dos +# CP922 aix +# CP932 aix woe32 dos +# CP943 aix +# CP949 osf woe32 dos +# CP950 woe32 dos +# CP1046 aix +# CP1124 aix +# CP1125 dos +# CP1129 aix +# CP1250 woe32 +# CP1251 glibc solaris darwin woe32 +# CP1252 aix woe32 +# CP1253 woe32 +# CP1254 woe32 +# CP1255 glibc woe32 +# CP1256 woe32 +# CP1257 woe32 +# GB2312 Y glibc aix hpux irix solaris freebsd darwin +# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-TW glibc aix hpux irix osf solaris +# BIG5 Y glibc aix hpux osf solaris freebsd darwin +# BIG5-HKSCS glibc solaris +# GBK glibc aix osf solaris woe32 dos +# GB18030 glibc solaris +# SHIFT_JIS Y hpux osf solaris freebsd darwin +# JOHAB glibc solaris woe32 +# TIS-620 glibc aix hpux osf solaris +# VISCII Y glibc +# TCVN5712-1 glibc +# GEORGIAN-PS glibc +# HP-ROMAN8 hpux +# HP-ARABIC8 hpux +# HP-GREEK8 hpux +# HP-HEBREW8 hpux +# HP-TURKISH8 hpux +# HP-KANA8 hpux +# DEC-KANJI osf +# DEC-HANYU osf +# UTF-8 Y glibc aix hpux osf solaris +# +# Note: Names which are not marked as being a MIME name should not be used in +# Internet protocols for information interchange (mail, news, etc.). +# +# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications +# must understand both names and treat them as equivalent. +# +# The first argument passed to this file is the canonical host specification, +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM + +host="$1" +os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` +echo "# This file contains a table of character encoding aliases," +echo "# suitable for operating system '${os}'." +echo "# It was automatically generated from config.charset." +# List of references, updated during installation: +echo "# Packages using this file: " +case "$os" in + linux-gnulibc1*) + # Linux libc5 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "C ASCII" + echo "POSIX ASCII" + for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \ + en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \ + en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \ + es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \ + et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \ + fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \ + it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \ + sv_FI sv_SE; do + echo "$l ISO-8859-1" + echo "$l.iso-8859-1 ISO-8859-1" + echo "$l.iso-8859-15 ISO-8859-15" + echo "$l.iso-8859-15@euro ISO-8859-15" + echo "$l@euro ISO-8859-15" + echo "$l.cp-437 CP437" + echo "$l.cp-850 CP850" + echo "$l.cp-1252 CP1252" + echo "$l.cp-1252@euro CP1252" + #echo "$l.atari-st ATARI-ST" # not a commonly used encoding + echo "$l.utf-8 UTF-8" + echo "$l.utf-8@euro UTF-8" + done + for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \ + sl_SI sr sr_CS sr_YU; do + echo "$l ISO-8859-2" + echo "$l.iso-8859-2 ISO-8859-2" + echo "$l.cp-852 CP852" + echo "$l.cp-1250 CP1250" + echo "$l.utf-8 UTF-8" + done + for l in mk mk_MK ru ru_RU; do + echo "$l ISO-8859-5" + echo "$l.iso-8859-5 ISO-8859-5" + echo "$l.koi8-r KOI8-R" + echo "$l.cp-866 CP866" + echo "$l.cp-1251 CP1251" + echo "$l.utf-8 UTF-8" + done + for l in ar ar_SA; do + echo "$l ISO-8859-6" + echo "$l.iso-8859-6 ISO-8859-6" + echo "$l.cp-864 CP864" + #echo "$l.cp-868 CP868" # not a commonly used encoding + echo "$l.cp-1256 CP1256" + echo "$l.utf-8 UTF-8" + done + for l in el el_GR gr gr_GR; do + echo "$l ISO-8859-7" + echo "$l.iso-8859-7 ISO-8859-7" + echo "$l.cp-869 CP869" + echo "$l.cp-1253 CP1253" + echo "$l.cp-1253@euro CP1253" + echo "$l.utf-8 UTF-8" + echo "$l.utf-8@euro UTF-8" + done + for l in he he_IL iw iw_IL; do + echo "$l ISO-8859-8" + echo "$l.iso-8859-8 ISO-8859-8" + echo "$l.cp-862 CP862" + echo "$l.cp-1255 CP1255" + echo "$l.utf-8 UTF-8" + done + for l in tr tr_TR; do + echo "$l ISO-8859-9" + echo "$l.iso-8859-9 ISO-8859-9" + echo "$l.cp-857 CP857" + echo "$l.cp-1254 CP1254" + echo "$l.utf-8 UTF-8" + done + for l in lt lt_LT lv lv_LV; do + #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name + echo "$l ISO-8859-13" + done + for l in ru_UA uk uk_UA; do + echo "$l KOI8-U" + done + for l in zh zh_CN; do + #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name + echo "$l GB2312" + done + for l in ja ja_JP ja_JP.EUC; do + echo "$l EUC-JP" + done + for l in ko ko_KR; do + echo "$l EUC-KR" + done + for l in th th_TH; do + echo "$l TIS-620" + done + for l in fa fa_IR; do + #echo "$l ISIRI-3342" # a broken encoding + echo "$l.utf-8 UTF-8" + done + ;; + linux* | *-gnu*) + # With glibc-2.1 or newer, we don't need any canonicalization, + # because glibc has iconv and both glibc and libiconv support all + # GNU canonical names directly. Therefore, the Makefile does not + # need to install the alias file at all. + # The following applies only to glibc-2.0.x and older libcs. + echo "ISO_646.IRV:1983 ASCII" + ;; + aix*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-6 ISO-8859-6" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "IBM-850 CP850" + echo "IBM-856 CP856" + echo "IBM-921 ISO-8859-13" + echo "IBM-922 CP922" + echo "IBM-932 CP932" + echo "IBM-943 CP943" + echo "IBM-1046 CP1046" + echo "IBM-1124 CP1124" + echo "IBM-1129 CP1129" + echo "IBM-1252 CP1252" + echo "IBM-eucCN GB2312" + echo "IBM-eucJP EUC-JP" + echo "IBM-eucKR EUC-KR" + echo "IBM-eucTW EUC-TW" + echo "big5 BIG5" + echo "GBK GBK" + echo "TIS-620 TIS-620" + echo "UTF-8 UTF-8" + ;; + hpux*) + echo "iso88591 ISO-8859-1" + echo "iso88592 ISO-8859-2" + echo "iso88595 ISO-8859-5" + echo "iso88596 ISO-8859-6" + echo "iso88597 ISO-8859-7" + echo "iso88598 ISO-8859-8" + echo "iso88599 ISO-8859-9" + echo "iso885915 ISO-8859-15" + echo "roman8 HP-ROMAN8" + echo "arabic8 HP-ARABIC8" + echo "greek8 HP-GREEK8" + echo "hebrew8 HP-HEBREW8" + echo "turkish8 HP-TURKISH8" + echo "kana8 HP-KANA8" + echo "tis620 TIS-620" + echo "big5 BIG5" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "hp15CN GB2312" + #echo "ccdc ?" # what is this? + echo "SJIS SHIFT_JIS" + echo "utf8 UTF-8" + ;; + irix*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-9 ISO-8859-9" + echo "eucCN GB2312" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + ;; + osf*) + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "cp850 CP850" + echo "big5 BIG5" + echo "dechanyu DEC-HANYU" + echo "dechanzi GB2312" + echo "deckanji DEC-KANJI" + echo "deckorean EUC-KR" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "GBK GBK" + echo "KSC5601 CP949" + echo "sdeckanji EUC-JP" + echo "SJIS SHIFT_JIS" + echo "TACTIS TIS-620" + echo "UTF-8 UTF-8" + ;; + solaris*) + echo "646 ASCII" + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-3 ISO-8859-3" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-6 ISO-8859-6" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-8 ISO-8859-8" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-15 ISO-8859-15" + echo "koi8-r KOI8-R" + echo "ansi-1251 CP1251" + echo "BIG5 BIG5" + echo "Big5-HKSCS BIG5-HKSCS" + echo "gb2312 GB2312" + echo "GBK GBK" + echo "GB18030 GB18030" + echo "cns11643 EUC-TW" + echo "5601 EUC-KR" + echo "ko_KR.johap92 JOHAB" + echo "eucJP EUC-JP" + echo "PCK SHIFT_JIS" + echo "TIS620.2533 TIS-620" + #echo "sun_eu_greek ?" # what is this? + echo "UTF-8 UTF-8" + ;; + freebsd* | os2*) + # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just + # reuse FreeBSD's locale data for OS/2. + echo "C ASCII" + echo "US-ASCII ASCII" + for l in la_LN lt_LN; do + echo "$l.ASCII ASCII" + done + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ + lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do + echo "$l.ISO_8859-1 ISO-8859-1" + echo "$l.DIS_8859-15 ISO-8859-15" + done + for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do + echo "$l.ISO_8859-2 ISO-8859-2" + done + for l in la_LN lt_LT; do + echo "$l.ISO_8859-4 ISO-8859-4" + done + for l in ru_RU ru_SU; do + echo "$l.KOI8-R KOI8-R" + echo "$l.ISO_8859-5 ISO-8859-5" + echo "$l.CP866 CP866" + done + echo "uk_UA.KOI8-U KOI8-U" + echo "zh_TW.BIG5 BIG5" + echo "zh_TW.Big5 BIG5" + echo "zh_CN.EUC GB2312" + echo "ja_JP.EUC EUC-JP" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ja_JP.Shift_JIS SHIFT_JIS" + echo "ko_KR.EUC EUC-KR" + ;; + netbsd*) + echo "646 ASCII" + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-15 ISO-8859-15" + echo "eucCN GB2312" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "eucTW EUC-TW" + echo "BIG5 BIG5" + echo "SJIS SHIFT_JIS" + ;; + darwin*) + # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "C ASCII" + for l in en_AU en_CA en_GB en_US la_LN; do + echo "$l.US-ASCII ASCII" + done + for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ + fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ + nl_NL no_NO pt_PT sv_SE; do + echo "$l ISO-8859-1" + echo "$l.ISO8859-1 ISO-8859-1" + echo "$l.ISO8859-15 ISO-8859-15" + done + for l in la_LN; do + echo "$l.ISO8859-1 ISO-8859-1" + echo "$l.ISO8859-15 ISO-8859-15" + done + for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do + echo "$l.ISO8859-2 ISO-8859-2" + done + for l in la_LN lt_LT; do + echo "$l.ISO8859-4 ISO-8859-4" + done + for l in ru_RU; do + echo "$l.KOI8-R KOI8-R" + echo "$l.ISO8859-5 ISO-8859-5" + echo "$l.CP866 CP866" + done + for l in bg_BG; do + echo "$l.CP1251 CP1251" + done + echo "uk_UA.KOI8-U KOI8-U" + echo "zh_TW.BIG5 BIG5" + echo "zh_TW.Big5 BIG5" + echo "zh_CN.EUC GB2312" + echo "ja_JP.EUC EUC-JP" + echo "ja_JP.SJIS SHIFT_JIS" + echo "ko_KR.EUC EUC-KR" + ;; + beos*) + # BeOS has a single locale, and it has UTF-8 encoding. + echo "* UTF-8" + ;; + msdosdjgpp*) + # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + echo "#" + echo "# The encodings given here may not all be correct." + echo "# If you find that the encoding given for your language and" + echo "# country is not the one your DOS machine actually uses, just" + echo "# correct it in this file, and send a mail to" + echo "# Juan Manuel Guerrero " + echo "# and Bruno Haible ." + echo "#" + echo "C ASCII" + # ISO-8859-1 languages + echo "ca CP850" + echo "ca_ES CP850" + echo "da CP865" # not CP850 ?? + echo "da_DK CP865" # not CP850 ?? + echo "de CP850" + echo "de_AT CP850" + echo "de_CH CP850" + echo "de_DE CP850" + echo "en CP850" + echo "en_AU CP850" # not CP437 ?? + echo "en_CA CP850" + echo "en_GB CP850" + echo "en_NZ CP437" + echo "en_US CP437" + echo "en_ZA CP850" # not CP437 ?? + echo "es CP850" + echo "es_AR CP850" + echo "es_BO CP850" + echo "es_CL CP850" + echo "es_CO CP850" + echo "es_CR CP850" + echo "es_CU CP850" + echo "es_DO CP850" + echo "es_EC CP850" + echo "es_ES CP850" + echo "es_GT CP850" + echo "es_HN CP850" + echo "es_MX CP850" + echo "es_NI CP850" + echo "es_PA CP850" + echo "es_PY CP850" + echo "es_PE CP850" + echo "es_SV CP850" + echo "es_UY CP850" + echo "es_VE CP850" + echo "et CP850" + echo "et_EE CP850" + echo "eu CP850" + echo "eu_ES CP850" + echo "fi CP850" + echo "fi_FI CP850" + echo "fr CP850" + echo "fr_BE CP850" + echo "fr_CA CP850" + echo "fr_CH CP850" + echo "fr_FR CP850" + echo "ga CP850" + echo "ga_IE CP850" + echo "gd CP850" + echo "gd_GB CP850" + echo "gl CP850" + echo "gl_ES CP850" + echo "id CP850" # not CP437 ?? + echo "id_ID CP850" # not CP437 ?? + echo "is CP861" # not CP850 ?? + echo "is_IS CP861" # not CP850 ?? + echo "it CP850" + echo "it_CH CP850" + echo "it_IT CP850" + echo "lt CP775" + echo "lt_LT CP775" + echo "lv CP775" + echo "lv_LV CP775" + echo "nb CP865" # not CP850 ?? + echo "nb_NO CP865" # not CP850 ?? + echo "nl CP850" + echo "nl_BE CP850" + echo "nl_NL CP850" + echo "nn CP865" # not CP850 ?? + echo "nn_NO CP865" # not CP850 ?? + echo "no CP865" # not CP850 ?? + echo "no_NO CP865" # not CP850 ?? + echo "pt CP850" + echo "pt_BR CP850" + echo "pt_PT CP850" + echo "sv CP850" + echo "sv_SE CP850" + # ISO-8859-2 languages + echo "cs CP852" + echo "cs_CZ CP852" + echo "hr CP852" + echo "hr_HR CP852" + echo "hu CP852" + echo "hu_HU CP852" + echo "pl CP852" + echo "pl_PL CP852" + echo "ro CP852" + echo "ro_RO CP852" + echo "sk CP852" + echo "sk_SK CP852" + echo "sl CP852" + echo "sl_SI CP852" + echo "sq CP852" + echo "sq_AL CP852" + echo "sr CP852" # CP852 or CP866 or CP855 ?? + echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? + echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? + # ISO-8859-3 languages + echo "mt CP850" + echo "mt_MT CP850" + # ISO-8859-5 languages + echo "be CP866" + echo "be_BE CP866" + echo "bg CP866" # not CP855 ?? + echo "bg_BG CP866" # not CP855 ?? + echo "mk CP866" # not CP855 ?? + echo "mk_MK CP866" # not CP855 ?? + echo "ru CP866" + echo "ru_RU CP866" + echo "uk CP1125" + echo "uk_UA CP1125" + # ISO-8859-6 languages + echo "ar CP864" + echo "ar_AE CP864" + echo "ar_DZ CP864" + echo "ar_EG CP864" + echo "ar_IQ CP864" + echo "ar_IR CP864" + echo "ar_JO CP864" + echo "ar_KW CP864" + echo "ar_MA CP864" + echo "ar_OM CP864" + echo "ar_QA CP864" + echo "ar_SA CP864" + echo "ar_SY CP864" + # ISO-8859-7 languages + echo "el CP869" + echo "el_GR CP869" + # ISO-8859-8 languages + echo "he CP862" + echo "he_IL CP862" + # ISO-8859-9 languages + echo "tr CP857" + echo "tr_TR CP857" + # Japanese + echo "ja CP932" + echo "ja_JP CP932" + # Chinese + echo "zh_CN GBK" + echo "zh_TW CP950" # not CP938 ?? + # Korean + echo "kr CP949" # not CP934 ?? + echo "kr_KR CP949" # not CP934 ?? + # Thai + echo "th CP874" + echo "th_TH CP874" + # Other + echo "eo CP850" + echo "eo_EO CP850" + ;; +esac diff --git a/intl/dcgettext.c b/intl/dcgettext.c new file mode 100644 index 00000000..850acdee --- /dev/null +++ b/intl/dcgettext.c @@ -0,0 +1,56 @@ +/* Implementation of the dcgettext(3) function. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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 +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DCGETTEXT __dcgettext +# define DCIGETTEXT __dcigettext +#else +# define DCGETTEXT libintl_dcgettext +# define DCIGETTEXT libintl_dcigettext +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +char * +DCGETTEXT (const char *domainname, const char *msgid, int category) +{ + return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +INTDEF(__dcgettext) +weak_alias (__dcgettext, dcgettext); +#endif diff --git a/intl/dcigettext.c b/intl/dcigettext.c new file mode 100644 index 00000000..35238e2c --- /dev/null +++ b/intl/dcigettext.c @@ -0,0 +1,1219 @@ +/* Implementation of the internal dcigettext function. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +#include +#ifndef errno +extern int errno; +#endif +#ifndef __set_errno +# define __set_errno(val) errno = (val) +#endif + +#include +#include +#include + +#if defined HAVE_UNISTD_H || defined _LIBC +# include +#endif + +#include + +#ifdef _LIBC + /* Guess whether integer division by zero raises signal SIGFPE. + Set to 1 only if you know for sure. In case of doubt, set to 0. */ +# if defined __alpha__ || defined __arm__ || defined __i386__ \ + || defined __m68k__ || defined __s390__ +# define INTDIV0_RAISES_SIGFPE 1 +# else +# define INTDIV0_RAISES_SIGFPE 0 +# endif +#endif +#if !INTDIV0_RAISES_SIGFPE +# include +#endif + +#if defined HAVE_SYS_PARAM_H || defined _LIBC +# include +#endif + +#include "gettextP.h" +#include "plural-exp.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif +#include "hash-string.h" + +/* Thread safetyness. */ +#ifdef _LIBC +# include +#else +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_lock_define_initialized(CLASS, NAME) +# define __libc_lock_lock(NAME) +# define __libc_lock_unlock(NAME) +# define __libc_rwlock_define_initialized(CLASS, NAME) +# define __libc_rwlock_rdlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* Alignment of types. */ +#if defined __GNUC__ && __GNUC__ >= 2 +# define alignof(TYPE) __alignof__ (TYPE) +#else +# define alignof(TYPE) \ + ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain libintl_nl_default_default_domain +# define _nl_current_default_domain libintl_nl_current_default_domain +# define _nl_default_dirname libintl_nl_default_dirname +# define _nl_domain_bindings libintl_nl_domain_bindings +#endif + +/* Some compilers, like SunOS4 cc, don't have offsetof in . */ +#ifndef offsetof +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) +#endif + +/* @@ end of prolog @@ */ + +#ifdef _LIBC +/* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ +# define getcwd __getcwd +# ifndef stpcpy +# define stpcpy __stpcpy +# endif +# define tfind __tfind +#else +# if !defined HAVE_GETCWD +char *getwd (); +# define getcwd(buf, max) getwd (buf) +# else +# if VMS +# define getcwd(buf, max) (getcwd) (buf, max, 0) +# else +char *getcwd (); +# endif +# endif +# ifndef HAVE_STPCPY +static char *stpcpy (char *dest, const char *src); +# endif +# ifndef HAVE_MEMPCPY +static void *mempcpy (void *dest, const void *src, size_t n); +# endif +#endif + +/* Amount to increase buffer size by in each try. */ +#define PATH_INCR 32 + +/* The following is from pathmax.h. */ +/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define + PATH_MAX but might cause redefinition warnings when sys/param.h is + later included (as on MORE/BSD 4.3). */ +#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__) +# include +#endif + +#ifndef _POSIX_PATH_MAX +# define _POSIX_PATH_MAX 255 +#endif + +#if !defined PATH_MAX && defined _PC_PATH_MAX +# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) +#endif + +/* Don't include sys/param.h if it already has been. */ +#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN +# include +#endif + +#if !defined PATH_MAX && defined MAXPATHLEN +# define PATH_MAX MAXPATHLEN +#endif + +#ifndef PATH_MAX +# define PATH_MAX _POSIX_PATH_MAX +#endif + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +#endif + +/* This is the type used for the search tree where known translations + are stored. */ +struct known_translation_t +{ + /* Domain in which to search. */ + char *domainname; + + /* The category. */ + int category; + + /* State of the catalog counter at the point the string was found. */ + int counter; + + /* Catalog where the string was found. */ + struct loaded_l10nfile *domain; + + /* And finally the translation. */ + const char *translation; + size_t translation_length; + + /* Pointer to the string in question. */ + char msgid[ZERO]; +}; + +/* Root of the search tree with known translations. We can use this + only if the system provides the `tsearch' function family. */ +#if defined HAVE_TSEARCH || defined _LIBC +# include + +static void *root; + +# ifdef _LIBC +# define tsearch __tsearch +# endif + +/* Function to compare two entries in the table of known translations. */ +static int +transcmp (const void *p1, const void *p2) +{ + const struct known_translation_t *s1; + const struct known_translation_t *s2; + int result; + + s1 = (const struct known_translation_t *) p1; + s2 = (const struct known_translation_t *) p2; + + result = strcmp (s1->msgid, s2->msgid); + if (result == 0) + { + result = strcmp (s1->domainname, s2->domainname); + if (result == 0) + /* We compare the category last (though this is the cheapest + operation) since it is hopefully always the same (namely + LC_MESSAGES). */ + result = s1->category - s2->category; + } + + return result; +} +#endif + +#ifndef INTVARDEF +# define INTVARDEF(name) +#endif +#ifndef INTUSE +# define INTUSE(name) name +#endif + +/* Name of the default domain used for gettext(3) prior any call to + textdomain(3). The default value for this is "messages". */ +const char _nl_default_default_domain[] attribute_hidden = "messages"; + +/* Value used as the default domain for gettext(3). */ +const char *_nl_current_default_domain attribute_hidden + = _nl_default_default_domain; + +/* Contains the default location of the message catalogs. */ +#if defined __EMX__ +extern const char _nl_default_dirname[]; +#else +const char _nl_default_dirname[] = LOCALEDIR; +INTVARDEF (_nl_default_dirname) +#endif + +/* List with bindings of specific domains created by bindtextdomain() + calls. */ +struct binding *_nl_domain_bindings; + +/* Prototypes for local functions. */ +static char *plural_lookup (struct loaded_l10nfile *domain, + unsigned long int n, + const char *translation, size_t translation_len) + internal_function; +static const char *guess_category_value (int category, + const char *categoryname) + internal_function; +#ifdef _LIBC +# include "../locale/localeinfo.h" +# define category_to_name(category) _nl_category_names[category] +#else +static const char *category_to_name (int category) internal_function; +#endif + + +/* For those loosing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +/* Nothing has to be done. */ +# define freea(p) /* nothing */ +# define ADD_BLOCK(list, address) /* nothing */ +# define FREE_BLOCKS(list) /* nothing */ +#else +struct block_list +{ + void *address; + struct block_list *next; +}; +# define ADD_BLOCK(list, addr) \ + do { \ + struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ + /* If we cannot get a free block we cannot add the new element to \ + the list. */ \ + if (newp != NULL) { \ + newp->address = (addr); \ + newp->next = (list); \ + (list) = newp; \ + } \ + } while (0) +# define FREE_BLOCKS(list) \ + do { \ + while (list != NULL) { \ + struct block_list *old = list; \ + list = list->next; \ + free (old->address); \ + free (old); \ + } \ + } while (0) +# undef alloca +# define alloca(size) (malloc (size)) +# define freea(p) free (p) +#endif /* have alloca */ + + +#ifdef _LIBC +/* List of blocks allocated for translations. */ +typedef struct transmem_list +{ + struct transmem_list *next; + char data[ZERO]; +} transmem_block_t; +static struct transmem_list *transmem_list; +#else +typedef unsigned char transmem_block_t; +#endif + + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DCIGETTEXT __dcigettext +#else +# define DCIGETTEXT libintl_dcigettext +#endif + +/* Lock variable to protect the global data in the gettext implementation. */ +#ifdef _LIBC +__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden) +#endif + +/* Checking whether the binaries runs SUID must be done and glibc provides + easier methods therefore we make a difference here. */ +#ifdef _LIBC +# define ENABLE_SECURE __libc_enable_secure +# define DETERMINE_SECURE +#else +# ifndef HAVE_GETUID +# define getuid() 0 +# endif +# ifndef HAVE_GETGID +# define getgid() 0 +# endif +# ifndef HAVE_GETEUID +# define geteuid() getuid() +# endif +# ifndef HAVE_GETEGID +# define getegid() getgid() +# endif +static int enable_secure; +# define ENABLE_SECURE (enable_secure == 1) +# define DETERMINE_SECURE \ + if (enable_secure == 0) \ + { \ + if (getuid () != geteuid () || getgid () != getegid ()) \ + enable_secure = 1; \ + else \ + enable_secure = -1; \ + } +#endif + +/* Get the function to evaluate the plural expression. */ +#include "eval-plural.h" + +/* Look up MSGID in the DOMAINNAME message catalog for the current + CATEGORY locale and, if PLURAL is nonzero, search over string + depending on the plural form determined by N. */ +char * +DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2, + int plural, unsigned long int n, int category) +{ +#ifndef HAVE_ALLOCA + struct block_list *block_list = NULL; +#endif + struct loaded_l10nfile *domain; + struct binding *binding; + const char *categoryname; + const char *categoryvalue; + char *dirname, *xdomainname; + char *single_locale; + char *retval; + size_t retlen; + int saved_errno; +#if defined HAVE_TSEARCH || defined _LIBC + struct known_translation_t *search; + struct known_translation_t **foundp = NULL; + size_t msgid_len; +#endif + size_t domainname_len; + + /* If no real MSGID is given return NULL. */ + if (msgid1 == NULL) + return NULL; + +#ifdef _LIBC + if (category < 0 || category >= __LC_LAST || category == LC_ALL) + /* Bogus. */ + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); +#endif + + __libc_rwlock_rdlock (_nl_state_lock); + + /* If DOMAINNAME is NULL, we are interested in the default domain. If + CATEGORY is not LC_MESSAGES this might not make much sense but the + definition left this undefined. */ + if (domainname == NULL) + domainname = _nl_current_default_domain; + + /* OS/2 specific: backward compatibility with older libintl versions */ +#ifdef LC_MESSAGES_COMPAT + if (category == LC_MESSAGES_COMPAT) + category = LC_MESSAGES; +#endif + +#if defined HAVE_TSEARCH || defined _LIBC + msgid_len = strlen (msgid1) + 1; + + /* Try to find the translation among those which we found at + some time. */ + search = (struct known_translation_t *) + alloca (offsetof (struct known_translation_t, msgid) + msgid_len); + memcpy (search->msgid, msgid1, msgid_len); + search->domainname = (char *) domainname; + search->category = category; + + foundp = (struct known_translation_t **) tfind (search, &root, transcmp); + freea (search); + if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr) + { + /* Now deal with plural. */ + if (plural) + retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation, + (*foundp)->translation_length); + else + retval = (char *) (*foundp)->translation; + + __libc_rwlock_unlock (_nl_state_lock); + return retval; + } +#endif + + /* Preserve the `errno' value. */ + saved_errno = errno; + + /* See whether this is a SUID binary or not. */ + DETERMINE_SECURE; + + /* First find matching binding. */ + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } + } + + if (binding == NULL) + dirname = (char *) INTUSE(_nl_default_dirname); + else if (IS_ABSOLUTE_PATH (binding->dirname)) + dirname = binding->dirname; + else + { + /* We have a relative path. Make it absolute now. */ + size_t dirname_len = strlen (binding->dirname) + 1; + size_t path_max; + char *ret; + + path_max = (unsigned int) PATH_MAX; + path_max += 2; /* The getcwd docs say to do this. */ + + for (;;) + { + dirname = (char *) alloca (path_max + dirname_len); + ADD_BLOCK (block_list, dirname); + + __set_errno (0); + ret = getcwd (dirname, path_max); + if (ret != NULL || errno != ERANGE) + break; + + path_max += path_max / 2; + path_max += PATH_INCR; + } + + if (ret == NULL) + /* We cannot get the current working directory. Don't signal an + error but simply return the default string. */ + goto return_untranslated; + + stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); + } + + /* Now determine the symbolic name of CATEGORY and its value. */ + categoryname = category_to_name (category); + categoryvalue = guess_category_value (category, categoryname); + + domainname_len = strlen (domainname); + xdomainname = (char *) alloca (strlen (categoryname) + + domainname_len + 5); + ADD_BLOCK (block_list, xdomainname); + + stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), + domainname, domainname_len), + ".mo"); + + /* Creating working area. */ + single_locale = (char *) alloca (strlen (categoryvalue) + 1); + ADD_BLOCK (block_list, single_locale); + + + /* Search for the given string. This is a loop because we perhaps + got an ordered list of languages to consider for the translation. */ + while (1) + { + /* Make CATEGORYVALUE point to the next element of the list. */ + while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') + ++categoryvalue; + if (categoryvalue[0] == '\0') + { + /* The whole contents of CATEGORYVALUE has been searched but + no valid entry has been found. We solve this situation + by implicitly appending a "C" entry, i.e. no translation + will take place. */ + single_locale[0] = 'C'; + single_locale[1] = '\0'; + } + else + { + char *cp = single_locale; + while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') + *cp++ = *categoryvalue++; + *cp = '\0'; + + /* When this is a SUID binary we must not allow accessing files + outside the dedicated directories. */ + if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale)) + /* Ingore this entry. */ + continue; + } + + /* If the current locale value is C (or POSIX) we don't load a + domain. Return the MSGID. */ + if (strcmp (single_locale, "C") == 0 + || strcmp (single_locale, "POSIX") == 0) + break; + + /* Find structure describing the message catalog matching the + DOMAINNAME and CATEGORY. */ + domain = _nl_find_domain (dirname, single_locale, xdomainname, binding); + + if (domain != NULL) + { + retval = _nl_find_msg (domain, binding, msgid1, &retlen); + + if (retval == NULL) + { + int cnt; + + for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) + { + retval = _nl_find_msg (domain->successor[cnt], binding, + msgid1, &retlen); + + if (retval != NULL) + { + domain = domain->successor[cnt]; + break; + } + } + } + + if (retval != NULL) + { + /* Found the translation of MSGID1 in domain DOMAIN: + starting at RETVAL, RETLEN bytes. */ + FREE_BLOCKS (block_list); +#if defined HAVE_TSEARCH || defined _LIBC + if (foundp == NULL) + { + /* Create a new entry and add it to the search tree. */ + struct known_translation_t *newp; + + newp = (struct known_translation_t *) + malloc (offsetof (struct known_translation_t, msgid) + + msgid_len + domainname_len + 1); + if (newp != NULL) + { + newp->domainname = + mempcpy (newp->msgid, msgid1, msgid_len); + memcpy (newp->domainname, domainname, domainname_len + 1); + newp->category = category; + newp->counter = _nl_msg_cat_cntr; + newp->domain = domain; + newp->translation = retval; + newp->translation_length = retlen; + + /* Insert the entry in the search tree. */ + foundp = (struct known_translation_t **) + tsearch (newp, &root, transcmp); + if (foundp == NULL + || __builtin_expect (*foundp != newp, 0)) + /* The insert failed. */ + free (newp); + } + } + else + { + /* We can update the existing entry. */ + (*foundp)->counter = _nl_msg_cat_cntr; + (*foundp)->domain = domain; + (*foundp)->translation = retval; + (*foundp)->translation_length = retlen; + } +#endif + __set_errno (saved_errno); + + /* Now deal with plural. */ + if (plural) + retval = plural_lookup (domain, n, retval, retlen); + + __libc_rwlock_unlock (_nl_state_lock); + return retval; + } + } + } + + return_untranslated: + /* Return the untranslated MSGID. */ + FREE_BLOCKS (block_list); + __libc_rwlock_unlock (_nl_state_lock); +#ifndef _LIBC + if (!ENABLE_SECURE) + { + extern void _nl_log_untranslated (const char *logfilename, + const char *domainname, + const char *msgid1, const char *msgid2, + int plural); + const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED"); + + if (logfilename != NULL && logfilename[0] != '\0') + _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural); + } +#endif + __set_errno (saved_errno); + return (plural == 0 + ? (char *) msgid1 + /* Use the Germanic plural rule. */ + : n == 1 ? (char *) msgid1 : (char *) msgid2); +} + + +char * +internal_function +_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) +{ + struct loaded_domain *domain; + nls_uint32 nstrings; + size_t act; + char *result; + size_t resultlen; + + if (domain_file->decided == 0) + _nl_load_domain (domain_file, domainbinding); + + if (domain_file->data == NULL) + return NULL; + + domain = (struct loaded_domain *) domain_file->data; + + nstrings = domain->nstrings; + + /* Locate the MSGID and its translation. */ + if (domain->hash_tab != NULL) + { + /* Use the hashing table. */ + nls_uint32 len = strlen (msgid); + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); + + while (1) + { + nls_uint32 nstr = + W (domain->must_swap_hash_tab, domain->hash_tab[idx]); + + if (nstr == 0) + /* Hash table entry is empty. */ + return NULL; + + nstr--; + + /* Compare msgid with the original string at index nstr. + We compare the lengths with >=, not ==, because plural entries + are represented by strings with an embedded NUL. */ + if (nstr < nstrings + ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len + && (strcmp (msgid, + domain->data + W (domain->must_swap, + domain->orig_tab[nstr].offset)) + == 0) + : domain->orig_sysdep_tab[nstr - nstrings].length > len + && (strcmp (msgid, + domain->orig_sysdep_tab[nstr - nstrings].pointer) + == 0)) + { + act = nstr; + goto found; + } + + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + } + /* NOTREACHED */ + } + else + { + /* Try the default method: binary search in the sorted array of + messages. */ + size_t top, bottom; + + bottom = 0; + top = nstrings; + while (bottom < top) + { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp (msgid, (domain->data + + W (domain->must_swap, + domain->orig_tab[act].offset))); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + goto found; + } + /* No translation was found. */ + return NULL; + } + + found: + /* The translation was found at index ACT. If we have to convert the + string to use a different character set, this is the time. */ + if (act < nstrings) + { + result = (char *) + (domain->data + W (domain->must_swap, domain->trans_tab[act].offset)); + resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; + } + else + { + result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer; + resultlen = domain->trans_sysdep_tab[act - nstrings].length; + } + +#if defined _LIBC || HAVE_ICONV + if (domain->codeset_cntr + != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) + { + /* The domain's codeset has changed through bind_textdomain_codeset() + since the message catalog was initialized or last accessed. We + have to reinitialize the converter. */ + _nl_free_domain_conv (domain); + _nl_init_domain_conv (domain_file, domain, domainbinding); + } + + if ( +# ifdef _LIBC + domain->conv != (__gconv_t) -1 +# else +# if HAVE_ICONV + domain->conv != (iconv_t) -1 +# endif +# endif + ) + { + /* We are supposed to do a conversion. First allocate an + appropriate table with the same structure as the table + of translations in the file, where we can put the pointers + to the converted strings in. + There is a slight complication with plural entries. They + are represented by consecutive NUL terminated strings. We + handle this case by converting RESULTLEN bytes, including + NULs. */ + + if (domain->conv_tab == NULL + && ((domain->conv_tab = + (char **) calloc (nstrings + domain->n_sysdep_strings, + sizeof (char *))) + == NULL)) + /* Mark that we didn't succeed allocating a table. */ + domain->conv_tab = (char **) -1; + + if (__builtin_expect (domain->conv_tab == (char **) -1, 0)) + /* Nothing we can do, no more memory. */ + goto converted; + + if (domain->conv_tab[act] == NULL) + { + /* We haven't used this string so far, so it is not + translated yet. Do this now. */ + /* We use a bit more efficient memory handling. + We allocate always larger blocks which get used over + time. This is faster than many small allocations. */ + __libc_lock_define_initialized (static, lock) +# define INITIAL_BLOCK_SIZE 4080 + static unsigned char *freemem; + static size_t freemem_size; + + const unsigned char *inbuf; + unsigned char *outbuf; + int malloc_count; +# ifndef _LIBC + transmem_block_t *transmem_list = NULL; +# endif + + __libc_lock_lock (lock); + + inbuf = (const unsigned char *) result; + outbuf = freemem + sizeof (size_t); + + malloc_count = 0; + while (1) + { + transmem_block_t *newmem; +# ifdef _LIBC + size_t non_reversible; + int res; + + if (freemem_size < sizeof (size_t)) + goto resize_freemem; + + res = __gconv (domain->conv, + &inbuf, inbuf + resultlen, + &outbuf, + outbuf + freemem_size - sizeof (size_t), + &non_reversible); + + if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT) + break; + + if (res != __GCONV_FULL_OUTPUT) + { + __libc_lock_unlock (lock); + goto converted; + } + + inbuf = result; +# else +# if HAVE_ICONV + const char *inptr = (const char *) inbuf; + size_t inleft = resultlen; + char *outptr = (char *) outbuf; + size_t outleft; + + if (freemem_size < sizeof (size_t)) + goto resize_freemem; + + outleft = freemem_size - sizeof (size_t); + if (iconv (domain->conv, + (ICONV_CONST char **) &inptr, &inleft, + &outptr, &outleft) + != (size_t) (-1)) + { + outbuf = (unsigned char *) outptr; + break; + } + if (errno != E2BIG) + { + __libc_lock_unlock (lock); + goto converted; + } +# endif +# endif + + resize_freemem: + /* We must allocate a new buffer or resize the old one. */ + if (malloc_count > 0) + { + ++malloc_count; + freemem_size = malloc_count * INITIAL_BLOCK_SIZE; + newmem = (transmem_block_t *) realloc (transmem_list, + freemem_size); +# ifdef _LIBC + if (newmem != NULL) + transmem_list = transmem_list->next; + else + { + struct transmem_list *old = transmem_list; + + transmem_list = transmem_list->next; + free (old); + } +# endif + } + else + { + malloc_count = 1; + freemem_size = INITIAL_BLOCK_SIZE; + newmem = (transmem_block_t *) malloc (freemem_size); + } + if (__builtin_expect (newmem == NULL, 0)) + { + freemem = NULL; + freemem_size = 0; + __libc_lock_unlock (lock); + goto converted; + } + +# ifdef _LIBC + /* Add the block to the list of blocks we have to free + at some point. */ + newmem->next = transmem_list; + transmem_list = newmem; + + freemem = newmem->data; + freemem_size -= offsetof (struct transmem_list, data); +# else + transmem_list = newmem; + freemem = newmem; +# endif + + outbuf = freemem + sizeof (size_t); + } + + /* We have now in our buffer a converted string. Put this + into the table of conversions. */ + *(size_t *) freemem = outbuf - freemem - sizeof (size_t); + domain->conv_tab[act] = (char *) freemem; + /* Shrink freemem, but keep it aligned. */ + freemem_size -= outbuf - freemem; + freemem = outbuf; + freemem += freemem_size & (alignof (size_t) - 1); + freemem_size = freemem_size & ~ (alignof (size_t) - 1); + + __libc_lock_unlock (lock); + } + + /* Now domain->conv_tab[act] contains the translation of all + the plural variants. */ + result = domain->conv_tab[act] + sizeof (size_t); + resultlen = *(size_t *) domain->conv_tab[act]; + } + + converted: + /* The result string is converted. */ + +#endif /* _LIBC || HAVE_ICONV */ + + *lengthp = resultlen; + return result; +} + + +/* Look up a plural variant. */ +static char * +internal_function +plural_lookup (struct loaded_l10nfile *domain, unsigned long int n, + const char *translation, size_t translation_len) +{ + struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; + unsigned long int index; + const char *p; + + index = plural_eval (domaindata->plural, n); + if (index >= domaindata->nplurals) + /* This should never happen. It means the plural expression and the + given maximum value do not match. */ + index = 0; + + /* Skip INDEX strings at TRANSLATION. */ + p = translation; + while (index-- > 0) + { +#ifdef _LIBC + p = __rawmemchr (p, '\0'); +#else + p = strchr (p, '\0'); +#endif + /* And skip over the NUL byte. */ + p++; + + if (p >= translation + translation_len) + /* This should never happen. It means the plural expression + evaluated to a value larger than the number of variants + available for MSGID1. */ + return (char *) translation; + } + return (char *) p; +} + +#ifndef _LIBC +/* Return string representation of locale CATEGORY. */ +static const char * +internal_function +category_to_name (int category) +{ + const char *retval; + + switch (category) + { +#ifdef LC_COLLATE + case LC_COLLATE: + retval = "LC_COLLATE"; + break; +#endif +#ifdef LC_CTYPE + case LC_CTYPE: + retval = "LC_CTYPE"; + break; +#endif +#ifdef LC_MONETARY + case LC_MONETARY: + retval = "LC_MONETARY"; + break; +#endif +#ifdef LC_NUMERIC + case LC_NUMERIC: + retval = "LC_NUMERIC"; + break; +#endif +#ifdef LC_TIME + case LC_TIME: + retval = "LC_TIME"; + break; +#endif +#ifdef LC_MESSAGES + case LC_MESSAGES: + retval = "LC_MESSAGES"; + break; +#endif +#ifdef LC_RESPONSE + case LC_RESPONSE: + retval = "LC_RESPONSE"; + break; +#endif +#ifdef LC_ALL + case LC_ALL: + /* This might not make sense but is perhaps better than any other + value. */ + retval = "LC_ALL"; + break; +#endif + default: + /* If you have a better idea for a default value let me know. */ + retval = "LC_XXX"; + } + + return retval; +} +#endif + +/* Guess value of current locale from value of the environment variables. */ +static const char * +internal_function +guess_category_value (int category, const char *categoryname) +{ + const char *language; + const char *retval; + + /* The highest priority value is the `LANGUAGE' environment + variable. But we don't use the value if the currently selected + locale is the C locale. This is a GNU extension. */ + language = getenv ("LANGUAGE"); + if (language != NULL && language[0] == '\0') + language = NULL; + + /* We have to proceed with the POSIX methods of looking to `LC_ALL', + `LC_xxx', and `LANG'. On some systems this can be done by the + `setlocale' function itself. */ +#ifdef _LIBC + retval = __current_locale_name (category); +#else + retval = _nl_locale_name (category, categoryname); +#endif + + /* Ignore LANGUAGE if the locale is set to "C" because + 1. "C" locale usually uses the ASCII encoding, and most international + messages use non-ASCII characters. These characters get displayed + as question marks (if using glibc's iconv()) or as invalid 8-bit + characters (because other iconv()s refuse to convert most non-ASCII + characters to ASCII). In any case, the output is ugly. + 2. The precise output of some programs in the "C" locale is specified + by POSIX and should not depend on environment variables like + "LANGUAGE". We allow such programs to use gettext(). */ + return language != NULL && strcmp (retval, "C") != 0 ? language : retval; +} + +/* @@ begin of epilog @@ */ + +/* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ +#if !_LIBC && !HAVE_STPCPY +static char * +stpcpy (char *dest, const char *src) +{ + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; +} +#endif + +#if !_LIBC && !HAVE_MEMPCPY +static void * +mempcpy (void *dest, const void *src, size_t n) +{ + return (void *) ((char *) memcpy (dest, src, n) + n); +} +#endif + + +#ifdef _LIBC +/* If we want to free all resources we have to do some work at + program's end. */ +libc_freeres_fn (free_mem) +{ + void *old; + + while (_nl_domain_bindings != NULL) + { + struct binding *oldp = _nl_domain_bindings; + _nl_domain_bindings = _nl_domain_bindings->next; + if (oldp->dirname != INTUSE(_nl_default_dirname)) + /* Yes, this is a pointer comparison. */ + free (oldp->dirname); + free (oldp->codeset); + free (oldp); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); + + /* Remove the search tree with the known translations. */ + __tdestroy (root, free); + root = NULL; + + while (transmem_list != NULL) + { + old = transmem_list; + transmem_list = transmem_list->next; + free (old); + } +} +#endif diff --git a/intl/dcngettext.c b/intl/dcngettext.c new file mode 100644 index 00000000..48a3e09e --- /dev/null +++ b/intl/dcngettext.c @@ -0,0 +1,57 @@ +/* Implementation of the dcngettext(3) function. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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 +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DCNGETTEXT __dcngettext +# define DCIGETTEXT __dcigettext +#else +# define DCNGETTEXT libintl_dcngettext +# define DCIGETTEXT libintl_dcigettext +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +char * +DCNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) +{ + return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__dcngettext, dcngettext); +#endif diff --git a/intl/dgettext.c b/intl/dgettext.c new file mode 100644 index 00000000..b64b0f5d --- /dev/null +++ b/intl/dgettext.c @@ -0,0 +1,58 @@ +/* Implementation of the dgettext(3) function. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "gettextP.h" + +#include + +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DGETTEXT __dgettext +# define DCGETTEXT INTUSE(__dcgettext) +#else +# define DGETTEXT libintl_dgettext +# define DCGETTEXT libintl_dcgettext +#endif + +/* Look up MSGID in the DOMAINNAME message catalog of the current + LC_MESSAGES locale. */ +char * +DGETTEXT (const char *domainname, const char *msgid) +{ + return DCGETTEXT (domainname, msgid, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__dgettext, dgettext); +#endif diff --git a/intl/dngettext.c b/intl/dngettext.c new file mode 100644 index 00000000..7815637f --- /dev/null +++ b/intl/dngettext.c @@ -0,0 +1,59 @@ +/* Implementation of the dngettext(3) function. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "gettextP.h" + +#include + +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define DNGETTEXT __dngettext +# define DCNGETTEXT __dcngettext +#else +# define DNGETTEXT libintl_dngettext +# define DCNGETTEXT libintl_dcngettext +#endif + +/* Look up MSGID in the DOMAINNAME message catalog of the current + LC_MESSAGES locale and skip message according to the plural form. */ +char * +DNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) +{ + return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__dngettext, dngettext); +#endif diff --git a/intl/eval-plural.h b/intl/eval-plural.h new file mode 100644 index 00000000..01bd5af5 --- /dev/null +++ b/intl/eval-plural.h @@ -0,0 +1,108 @@ +/* Plural expression evaluation. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef STATIC +#define STATIC static +#endif + +/* Evaluate the plural expression and return an index value. */ +STATIC +unsigned long int +internal_function +plural_eval (struct expression *pexp, unsigned long int n) +{ + switch (pexp->nargs) + { + case 0: + switch (pexp->operation) + { + case var: + return n; + case num: + return pexp->val.num; + default: + break; + } + /* NOTREACHED */ + break; + case 1: + { + /* pexp->operation must be lnot. */ + unsigned long int arg = plural_eval (pexp->val.args[0], n); + return ! arg; + } + case 2: + { + unsigned long int leftarg = plural_eval (pexp->val.args[0], n); + if (pexp->operation == lor) + return leftarg || plural_eval (pexp->val.args[1], n); + else if (pexp->operation == land) + return leftarg && plural_eval (pexp->val.args[1], n); + else + { + unsigned long int rightarg = plural_eval (pexp->val.args[1], n); + + switch (pexp->operation) + { + case mult: + return leftarg * rightarg; + case divide: +#if !INTDIV0_RAISES_SIGFPE + if (rightarg == 0) + raise (SIGFPE); +#endif + return leftarg / rightarg; + case module: +#if !INTDIV0_RAISES_SIGFPE + if (rightarg == 0) + raise (SIGFPE); +#endif + return leftarg % rightarg; + case plus: + return leftarg + rightarg; + case minus: + return leftarg - rightarg; + case less_than: + return leftarg < rightarg; + case greater_than: + return leftarg > rightarg; + case less_or_equal: + return leftarg <= rightarg; + case greater_or_equal: + return leftarg >= rightarg; + case equal: + return leftarg == rightarg; + case not_equal: + return leftarg != rightarg; + default: + break; + } + } + /* NOTREACHED */ + break; + } + case 3: + { + /* pexp->operation must be qmop. */ + unsigned long int boolarg = plural_eval (pexp->val.args[0], n); + return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); + } + } + /* NOTREACHED */ + return 0; +} diff --git a/intl/explodename.c b/intl/explodename.c new file mode 100644 index 00000000..52c25e72 --- /dev/null +++ b/intl/explodename.c @@ -0,0 +1,185 @@ +/* Copyright (C) 1995-1998, 2000-2001, 2003 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 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 +#endif + +#include +#include +#include + +#include "loadinfo.h" + +/* On some strange systems still no definition of NULL is found. Sigh! */ +#ifndef NULL +# if defined __STDC__ && __STDC__ +# define NULL ((void *) 0) +# else +# define NULL 0 +# endif +#endif + +/* @@ end of prolog @@ */ + +char * +_nl_find_language (const char *name) +{ + while (name[0] != '\0' && name[0] != '_' && name[0] != '@' + && name[0] != '+' && name[0] != ',') + ++name; + + return (char *) name; +} + + +int +_nl_explode_name (char *name, + const char **language, const char **modifier, + const char **territory, const char **codeset, + const char **normalized_codeset, const char **special, + const char **sponsor, const char **revision) +{ + enum { undecided, xpg, cen } syntax; + char *cp; + int mask; + + *modifier = NULL; + *territory = NULL; + *codeset = NULL; + *normalized_codeset = NULL; + *special = NULL; + *sponsor = NULL; + *revision = NULL; + + /* Now we determine the single parts of the locale name. First + look for the language. Termination symbols are `_' and `@' if + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ + mask = 0; + syntax = undecided; + *language = cp = name; + cp = _nl_find_language (*language); + + if (*language == cp) + /* This does not make sense: language has to be specified. Use + this entry as it is without exploding. Perhaps it is an alias. */ + cp = strchr (*language, '\0'); + else if (cp[0] == '_') + { + /* Next is the territory. */ + cp[0] = '\0'; + *territory = ++cp; + + while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' + && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= TERRITORY; + + if (cp[0] == '.') + { + /* Next is the codeset. */ + syntax = xpg; + cp[0] = '\0'; + *codeset = ++cp; + + while (cp[0] != '\0' && cp[0] != '@') + ++cp; + + mask |= XPG_CODESET; + + if (*codeset != cp && (*codeset)[0] != '\0') + { + *normalized_codeset = _nl_normalize_codeset (*codeset, + cp - *codeset); + if (strcmp (*codeset, *normalized_codeset) == 0) + free ((char *) *normalized_codeset); + else + mask |= XPG_NORM_CODESET; + } + } + } + + if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) + { + /* Next is the modifier. */ + syntax = cp[0] == '@' ? xpg : cen; + cp[0] = '\0'; + *modifier = ++cp; + + while (syntax == cen && cp[0] != '\0' && cp[0] != '+' + && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= XPG_MODIFIER | CEN_AUDIENCE; + } + + if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) + { + syntax = cen; + + if (cp[0] == '+') + { + /* Next is special application (CEN syntax). */ + cp[0] = '\0'; + *special = ++cp; + + while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') + ++cp; + + mask |= CEN_SPECIAL; + } + + if (cp[0] == ',') + { + /* Next is sponsor (CEN syntax). */ + cp[0] = '\0'; + *sponsor = ++cp; + + while (cp[0] != '\0' && cp[0] != '_') + ++cp; + + mask |= CEN_SPONSOR; + } + + if (cp[0] == '_') + { + /* Next is revision (CEN syntax). */ + cp[0] = '\0'; + *revision = ++cp; + + mask |= CEN_REVISION; + } + } + + /* For CEN syntax values it might be important to have the + separator character in the file name, not for XPG syntax. */ + if (syntax == xpg) + { + if (*territory != NULL && (*territory)[0] == '\0') + mask &= ~TERRITORY; + + if (*codeset != NULL && (*codeset)[0] == '\0') + mask &= ~XPG_CODESET; + + if (*modifier != NULL && (*modifier)[0] == '\0') + mask &= ~XPG_MODIFIER; + } + + return mask; +} diff --git a/intl/finddomain.c b/intl/finddomain.c new file mode 100644 index 00000000..4992a8c9 --- /dev/null +++ b/intl/finddomain.c @@ -0,0 +1,192 @@ +/* Handle list of needed message catalogs + Copyright (C) 1995-1999, 2000-2001, 2003 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 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 +#endif + +#include +#include +#include +#include + +#if defined HAVE_UNISTD_H || defined _LIBC +# include +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ +/* List of already loaded domains. */ +static struct loaded_l10nfile *_nl_loaded_domains; + + +/* Return a data structure describing the message catalog described by + the DOMAINNAME and CATEGORY parameters with respect to the currently + established bindings. */ +struct loaded_l10nfile * +internal_function +_nl_find_domain (const char *dirname, char *locale, + const char *domainname, struct binding *domainbinding) +{ + struct loaded_l10nfile *retval; + const char *language; + const char *modifier; + const char *territory; + const char *codeset; + const char *normalized_codeset; + const char *special; + const char *sponsor; + const char *revision; + const char *alias_value; + int mask; + + /* LOCALE can consist of up to four recognized parts for the XPG syntax: + + language[_territory[.codeset]][@modifier] + + and six parts for the CEN syntax: + + language[_territory][+audience][+special][,[sponsor][_revision]] + + Beside the first part all of them are allowed to be missing. If + the full specified locale is not found, the less specific one are + looked for. The various parts will be stripped off according to + the following order: + (1) revision + (2) sponsor + (3) special + (4) codeset + (5) normalized codeset + (6) territory + (7) audience/modifier + */ + + /* If we have already tested for this locale entry there has to + be one data set in the list of loaded domains. */ + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, 0, locale, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, domainname, 0); + if (retval != NULL) + { + /* We know something about this locale. */ + int cnt; + + if (retval->decided == 0) + _nl_load_domain (retval, domainbinding); + + if (retval->data != NULL) + return retval; + + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided == 0) + _nl_load_domain (retval->successor[cnt], domainbinding); + + if (retval->successor[cnt]->data != NULL) + break; + } + return cnt >= 0 ? retval : NULL; + /* NOTREACHED */ + } + + /* See whether the locale value is an alias. If yes its value + *overwrites* the alias name. No test for the original value is + done. */ + alias_value = _nl_expand_alias (locale); + if (alias_value != NULL) + { +#if defined _LIBC || defined HAVE_STRDUP + locale = strdup (alias_value); + if (locale == NULL) + return NULL; +#else + size_t len = strlen (alias_value) + 1; + locale = (char *) malloc (len); + if (locale == NULL) + return NULL; + + memcpy (locale, alias_value, len); +#endif + } + + /* Now we determine the single parts of the locale name. First + look for the language. Termination symbols are `_' and `@' if + we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ + mask = _nl_explode_name (locale, &language, &modifier, &territory, + &codeset, &normalized_codeset, &special, + &sponsor, &revision); + + /* Create all possible locale entries which might be interested in + generalization. */ + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, mask, language, territory, + codeset, normalized_codeset, modifier, special, + sponsor, revision, domainname, 1); + if (retval == NULL) + /* This means we are out of core. */ + return NULL; + + if (retval->decided == 0) + _nl_load_domain (retval, domainbinding); + if (retval->data == NULL) + { + int cnt; + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided == 0) + _nl_load_domain (retval->successor[cnt], domainbinding); + if (retval->successor[cnt]->data != NULL) + break; + } + } + + /* The room for an alias was dynamically allocated. Free it now. */ + if (alias_value != NULL) + free (locale); + + /* The space for normalized_codeset is dynamically allocated. Free it. */ + if (mask & XPG_NORM_CODESET) + free ((void *) normalized_codeset); + + return retval; +} + + +#ifdef _LIBC +libc_freeres_fn (free_mem) +{ + struct loaded_l10nfile *runp = _nl_loaded_domains; + + while (runp != NULL) + { + struct loaded_l10nfile *here = runp; + if (runp->data != NULL) + _nl_unload_domain ((struct loaded_domain *) runp->data); + runp = runp->next; + free ((char *) here->filename); + free (here); + } +} +#endif diff --git a/intl/gettext.c b/intl/gettext.c new file mode 100644 index 00000000..92c42faa --- /dev/null +++ b/intl/gettext.c @@ -0,0 +1,63 @@ +/* Implementation of gettext(3) function. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef _LIBC +# define __need_NULL +# include +#else +# include /* Just for NULL. */ +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define GETTEXT __gettext +# define DCGETTEXT INTUSE(__dcgettext) +#else +# define GETTEXT libintl_gettext +# define DCGETTEXT libintl_dcgettext +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +char * +GETTEXT (const char *msgid) +{ + return DCGETTEXT (NULL, msgid, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__gettext, gettext); +#endif diff --git a/intl/gettextP.h b/intl/gettextP.h new file mode 100644 index 00000000..4d66c3de --- /dev/null +++ b/intl/gettextP.h @@ -0,0 +1,215 @@ +/* Header describing internals of libintl library. + Copyright (C) 1995-1999, 2000-2003 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 Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _GETTEXTP_H +#define _GETTEXTP_H + +#include /* Get size_t. */ + +#ifdef _LIBC +# include "../iconv/gconv_int.h" +#else +# if HAVE_ICONV +# include +# endif +#endif + +#include "loadinfo.h" + +#include "gmo.h" /* Get nls_uint32. */ + +/* @@ end of prolog @@ */ + +#ifndef internal_function +# define internal_function +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + +#ifndef W +# define W(flag, data) ((flag) ? SWAP (data) : (data)) +#endif + + +#ifdef _LIBC +# include +# define SWAP(i) bswap_32 (i) +#else +static inline nls_uint32 +SWAP (i) + nls_uint32 i; +{ + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); +} +#endif + + +/* In-memory representation of system dependent string. */ +struct sysdep_string_desc +{ + /* Length of addressed string, including the trailing NUL. */ + size_t length; + /* Pointer to addressed string. */ + const char *pointer; +}; + +/* The representation of an opened message catalog. */ +struct loaded_domain +{ + /* Pointer to memory containing the .mo file. */ + const char *data; + /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */ + int use_mmap; + /* Size of mmap()ed memory. */ + size_t mmap_size; + /* 1 if the .mo file uses a different endianness than this machine. */ + int must_swap; + /* Pointer to additional malloc()ed memory. */ + void *malloced; + + /* Number of static strings pairs. */ + nls_uint32 nstrings; + /* Pointer to descriptors of original strings in the file. */ + const struct string_desc *orig_tab; + /* Pointer to descriptors of translated strings in the file. */ + const struct string_desc *trans_tab; + + /* Number of system dependent strings pairs. */ + nls_uint32 n_sysdep_strings; + /* Pointer to descriptors of original sysdep strings. */ + const struct sysdep_string_desc *orig_sysdep_tab; + /* Pointer to descriptors of translated sysdep strings. */ + const struct sysdep_string_desc *trans_sysdep_tab; + + /* Size of hash table. */ + nls_uint32 hash_size; + /* Pointer to hash table. */ + const nls_uint32 *hash_tab; + /* 1 if the hash table uses a different endianness than this machine. */ + int must_swap_hash_tab; + + int codeset_cntr; +#ifdef _LIBC + __gconv_t conv; +#else +# if HAVE_ICONV + iconv_t conv; +# endif +#endif + char **conv_tab; + + struct expression *plural; + unsigned long int nplurals; +}; + +/* We want to allocate a string at the end of the struct. But ISO C + doesn't allow zero sized arrays. */ +#ifdef __GNUC__ +# define ZERO 0 +#else +# define ZERO 1 +#endif + +/* A set of settings bound to a message domain. Used to store settings + from bindtextdomain() and bind_textdomain_codeset(). */ +struct binding +{ + struct binding *next; + char *dirname; + int codeset_cntr; /* Incremented each time codeset changes. */ + char *codeset; + char domainname[ZERO]; +}; + +/* A counter which is incremented each time some previous translations + become invalid. + This variable is part of the external ABI of the GNU libintl. */ +extern int _nl_msg_cat_cntr; + +#ifndef _LIBC +const char *_nl_locale_name (int category, const char *categoryname); +#endif + +struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, + const char *__domainname, + struct binding *__domainbinding) + internal_function; +void _nl_load_domain (struct loaded_l10nfile *__domain, + struct binding *__domainbinding) + internal_function; +void _nl_unload_domain (struct loaded_domain *__domain) + internal_function; +const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding) + internal_function; +void _nl_free_domain_conv (struct loaded_domain *__domain) + internal_function; + +char *_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) + internal_function; + +#ifdef _LIBC +extern char *__gettext (const char *__msgid); +extern char *__dgettext (const char *__domainname, const char *__msgid); +extern char *__dcgettext (const char *__domainname, const char *__msgid, + int __category); +extern char *__ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +extern char *__dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n); +extern char *__dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +extern char *__dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); +extern char *__textdomain (const char *__domainname); +extern char *__bindtextdomain (const char *__domainname, + const char *__dirname); +extern char *__bind_textdomain_codeset (const char *__domainname, + const char *__codeset); +#else +/* Declare the exported libintl_* functions, in a way that allows us to + call them under their real name. */ +# undef _INTL_REDIRECT_INLINE +# undef _INTL_REDIRECT_MACROS +# define _INTL_REDIRECT_MACROS +# include "libgnuintl.h" +extern char *libintl_dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); +#endif + +/* @@ begin of epilog @@ */ + +#endif /* gettextP.h */ diff --git a/intl/gmo.h b/intl/gmo.h new file mode 100644 index 00000000..e7c9cc14 --- /dev/null +++ b/intl/gmo.h @@ -0,0 +1,149 @@ +/* Description of GNU message catalog format: general file layout. + Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _GETTEXT_H +#define _GETTEXT_H 1 + +#include + +/* @@ end of prolog @@ */ + +/* The magic number of the GNU message catalog format. */ +#define _MAGIC 0x950412de +#define _MAGIC_SWAPPED 0xde120495 + +/* Revision number of the currently used .mo (binary) file format. */ +#define MO_REVISION_NUMBER 0 +#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1 + +/* The following contortions are an attempt to use the C preprocessor + to determine an unsigned integral type that is 32 bits wide. An + alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but + as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work + when cross-compiling. */ + +#if __STDC__ +# define UINT_MAX_32_BITS 4294967295U +#else +# define UINT_MAX_32_BITS 0xFFFFFFFF +#endif + +/* If UINT_MAX isn't defined, assume it's a 32-bit type. + This should be valid for all systems GNU cares about because + that doesn't include 16-bit systems, and only modern systems + (that certainly have ) have 64+-bit integral types. */ + +#ifndef UINT_MAX +# define UINT_MAX UINT_MAX_32_BITS +#endif + +#if UINT_MAX == UINT_MAX_32_BITS +typedef unsigned nls_uint32; +#else +# if USHRT_MAX == UINT_MAX_32_BITS +typedef unsigned short nls_uint32; +# else +# if ULONG_MAX == UINT_MAX_32_BITS +typedef unsigned long nls_uint32; +# else + /* The following line is intended to throw an error. Using #error is + not portable enough. */ + "Cannot determine unsigned 32-bit data type." +# endif +# endif +#endif + + +/* Header for binary .mo file format. */ +struct mo_file_header +{ + /* The magic number. */ + nls_uint32 magic; + /* The revision number of the file format. */ + nls_uint32 revision; + + /* The following are only used in .mo files with major revision 0 or 1. */ + + /* The number of strings pairs. */ + nls_uint32 nstrings; + /* Offset of table with start offsets of original strings. */ + nls_uint32 orig_tab_offset; + /* Offset of table with start offsets of translated strings. */ + nls_uint32 trans_tab_offset; + /* Size of hash table. */ + nls_uint32 hash_tab_size; + /* Offset of first hash table entry. */ + nls_uint32 hash_tab_offset; + + /* The following are only used in .mo files with minor revision >= 1. */ + + /* The number of system dependent segments. */ + nls_uint32 n_sysdep_segments; + /* Offset of table describing system dependent segments. */ + nls_uint32 sysdep_segments_offset; + /* The number of system dependent strings pairs. */ + nls_uint32 n_sysdep_strings; + /* Offset of table with start offsets of original sysdep strings. */ + nls_uint32 orig_sysdep_tab_offset; + /* Offset of table with start offsets of translated sysdep strings. */ + nls_uint32 trans_sysdep_tab_offset; +}; + +/* Descriptor for static string contained in the binary .mo file. */ +struct string_desc +{ + /* Length of addressed string, not including the trailing NUL. */ + nls_uint32 length; + /* Offset of string in file. */ + nls_uint32 offset; +}; + +/* The following are only used in .mo files with minor revision >= 1. */ + +/* Descriptor for system dependent string segment. */ +struct sysdep_segment +{ + /* Length of addressed string, including the trailing NUL. */ + nls_uint32 length; + /* Offset of string in file. */ + nls_uint32 offset; +}; + +/* Descriptor for system dependent string. */ +struct sysdep_string +{ + /* Offset of static string segments in file. */ + nls_uint32 offset; + /* Alternating sequence of static and system dependent segments. + The last segment is a static segment, including the trailing NUL. */ + struct segment_pair + { + /* Size of static segment. */ + nls_uint32 segsize; + /* Reference to system dependent string segment, or ~0 at the end. */ + nls_uint32 sysdepref; + } segments[1]; +}; + +/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF, + regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */ +#define SEGMENTS_END ((nls_uint32) ~0) + +/* @@ begin of epilog @@ */ + +#endif /* gettext.h */ diff --git a/intl/hash-string.h b/intl/hash-string.h new file mode 100644 index 00000000..093e3b1c --- /dev/null +++ b/intl/hash-string.h @@ -0,0 +1,48 @@ +/* Description of GNU message catalog format: string hashing function. + Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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. */ + +/* @@ end of prolog @@ */ + +/* We assume to have `unsigned long int' value with at least 32 bits. */ +#define HASHWORDBITS 32 + + +/* Defines the so called `hashpjw' function by P.J. Weinberger + [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, + 1986, 1987 Bell Telephone Laboratories, Inc.] */ +static inline unsigned long int +hash_string (const char *str_param) +{ + unsigned long int hval, g; + const char *str = str_param; + + /* Compute the hash value for the given string. */ + hval = 0; + while (*str != '\0') + { + hval <<= 4; + hval += (unsigned char) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); + if (g != 0) + { + hval ^= g >> (HASHWORDBITS - 8); + hval ^= g; + } + } + return hval; +} diff --git a/intl/intl-compat.c b/intl/intl-compat.c new file mode 100644 index 00000000..96f9d955 --- /dev/null +++ b/intl/intl-compat.c @@ -0,0 +1,131 @@ +/* intl-compat.c - Stub functions to call gettext functions from GNU gettext + Library. + Copyright (C) 1995, 2000-2003 Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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 +#endif + +#include "gettextP.h" + +/* @@ end of prolog @@ */ + +/* This file redirects the gettext functions (without prefix) to those + defined in the included GNU libintl library (with "libintl_" prefix). + It is compiled into libintl in order to make the AM_GNU_GETTEXT test + of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which + has the redirections primarily in the include file. + It is also compiled into libgnuintl so that libgnuintl.so can be used + as LD_PRELOADable library on glibc systems, to provide the extra + features that the functions in the libc don't have (namely, logging). */ + + +#undef gettext +#undef dgettext +#undef dcgettext +#undef ngettext +#undef dngettext +#undef dcngettext +#undef textdomain +#undef bindtextdomain +#undef bind_textdomain_codeset + + +/* When building a DLL, we must export some functions. Note that because + the functions are only defined for binary backward compatibility, we + don't need to use __declspec(dllimport) in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define DLL_EXPORTED __declspec(dllexport) +#else +# define DLL_EXPORTED +#endif + + +DLL_EXPORTED +char * +gettext (const char *msgid) +{ + return libintl_gettext (msgid); +} + + +DLL_EXPORTED +char * +dgettext (const char *domainname, const char *msgid) +{ + return libintl_dgettext (domainname, msgid); +} + + +DLL_EXPORTED +char * +dcgettext (const char *domainname, const char *msgid, int category) +{ + return libintl_dcgettext (domainname, msgid, category); +} + + +DLL_EXPORTED +char * +ngettext (const char *msgid1, const char *msgid2, unsigned long int n) +{ + return libintl_ngettext (msgid1, msgid2, n); +} + + +DLL_EXPORTED +char * +dngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) +{ + return libintl_dngettext (domainname, msgid1, msgid2, n); +} + + +DLL_EXPORTED +char * +dcngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) +{ + return libintl_dcngettext (domainname, msgid1, msgid2, n, category); +} + + +DLL_EXPORTED +char * +textdomain (const char *domainname) +{ + return libintl_textdomain (domainname); +} + + +DLL_EXPORTED +char * +bindtextdomain (const char *domainname, const char *dirname) +{ + return libintl_bindtextdomain (domainname, dirname); +} + + +DLL_EXPORTED +char * +bind_textdomain_codeset (const char *domainname, const char *codeset) +{ + return libintl_bind_textdomain_codeset (domainname, codeset); +} diff --git a/intl/l10nflist.c b/intl/l10nflist.c new file mode 100644 index 00000000..eb995aaf --- /dev/null +++ b/intl/l10nflist.c @@ -0,0 +1,421 @@ +/* Copyright (C) 1995-1999, 2000-2003 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 Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for stpcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#if defined _LIBC || defined HAVE_ARGZ_H +# include +#endif +#include +#include +#include + +#include "loadinfo.h" + +/* On some strange systems still no definition of NULL is found. Sigh! */ +#ifndef NULL +# if defined __STDC__ && __STDC__ +# define NULL ((void *) 0) +# else +# define NULL 0 +# endif +#endif + +/* @@ end of prolog @@ */ + +#ifdef _LIBC +/* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ +# ifndef stpcpy +# define stpcpy(dest, src) __stpcpy(dest, src) +# endif +#else +# ifndef HAVE_STPCPY +static char *stpcpy (char *dest, const char *src); +# endif +#endif + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +#endif + +/* Define function which are usually not available. */ + +#if !defined _LIBC && !defined HAVE___ARGZ_COUNT +/* Returns the number of strings in ARGZ. */ +static size_t +argz_count__ (const char *argz, size_t len) +{ + size_t count = 0; + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len + 1; + len -= part_len + 1; + count++; + } + return count; +} +# undef __argz_count +# define __argz_count(argz, len) argz_count__ (argz, len) +#else +# ifdef _LIBC +# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len) +# endif +#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ + +#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY +/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's + except the last into the character SEP. */ +static void +argz_stringify__ (char *argz, size_t len, int sep) +{ + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len; + len -= part_len + 1; + if (len > 0) + *argz++ = sep; + } +} +# undef __argz_stringify +# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) +#else +# ifdef _LIBC +# define __argz_stringify(argz, len, sep) \ + INTUSE(__argz_stringify) (argz, len, sep) +# endif +#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ + +#if !defined _LIBC && !defined HAVE___ARGZ_NEXT +static char * +argz_next__ (char *argz, size_t argz_len, const char *entry) +{ + if (entry) + { + if (entry < argz + argz_len) + entry = strchr (entry, '\0') + 1; + + return entry >= argz + argz_len ? NULL : (char *) entry; + } + else + if (argz_len > 0) + return argz; + else + return 0; +} +# undef __argz_next +# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) +#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ + + +/* Return number of bits set in X. */ +static inline int +pop (int x) +{ + /* We assume that no more than 16 bits are used. */ + x = ((x & ~0x5555) >> 1) + (x & 0x5555); + x = ((x & ~0x3333) >> 2) + (x & 0x3333); + x = ((x >> 4) + x) & 0x0f0f; + x = ((x >> 8) + x) & 0xff; + + return x; +} + + +struct loaded_l10nfile * +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, + int mask, const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate) +{ + char *abs_filename; + struct loaded_l10nfile **lastp; + struct loaded_l10nfile *retval; + char *cp; + size_t dirlist_count; + size_t entries; + int cnt; + + /* If LANGUAGE contains an absolute directory specification, we ignore + DIRLIST. */ + if (IS_ABSOLUTE_PATH (language)) + dirlist_len = 0; + + /* Allocate room for the full file name. */ + abs_filename = (char *) malloc (dirlist_len + + strlen (language) + + ((mask & TERRITORY) != 0 + ? strlen (territory) + 1 : 0) + + ((mask & XPG_CODESET) != 0 + ? strlen (codeset) + 1 : 0) + + ((mask & XPG_NORM_CODESET) != 0 + ? strlen (normalized_codeset) + 1 : 0) + + (((mask & XPG_MODIFIER) != 0 + || (mask & CEN_AUDIENCE) != 0) + ? strlen (modifier) + 1 : 0) + + ((mask & CEN_SPECIAL) != 0 + ? strlen (special) + 1 : 0) + + (((mask & CEN_SPONSOR) != 0 + || (mask & CEN_REVISION) != 0) + ? (1 + ((mask & CEN_SPONSOR) != 0 + ? strlen (sponsor) : 0) + + ((mask & CEN_REVISION) != 0 + ? strlen (revision) + 1 : 0)) : 0) + + 1 + strlen (filename) + 1); + + if (abs_filename == NULL) + return NULL; + + /* Construct file name. */ + cp = abs_filename; + if (dirlist_len > 0) + { + memcpy (cp, dirlist, dirlist_len); + __argz_stringify (cp, dirlist_len, PATH_SEPARATOR); + cp += dirlist_len; + cp[-1] = '/'; + } + + cp = stpcpy (cp, language); + + if ((mask & TERRITORY) != 0) + { + *cp++ = '_'; + cp = stpcpy (cp, territory); + } + if ((mask & XPG_CODESET) != 0) + { + *cp++ = '.'; + cp = stpcpy (cp, codeset); + } + if ((mask & XPG_NORM_CODESET) != 0) + { + *cp++ = '.'; + cp = stpcpy (cp, normalized_codeset); + } + if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) + { + /* This component can be part of both syntaces but has different + leading characters. For CEN we use `+', else `@'. */ + *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; + cp = stpcpy (cp, modifier); + } + if ((mask & CEN_SPECIAL) != 0) + { + *cp++ = '+'; + cp = stpcpy (cp, special); + } + if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) + { + *cp++ = ','; + if ((mask & CEN_SPONSOR) != 0) + cp = stpcpy (cp, sponsor); + if ((mask & CEN_REVISION) != 0) + { + *cp++ = '_'; + cp = stpcpy (cp, revision); + } + } + + *cp++ = '/'; + stpcpy (cp, filename); + + /* Look in list of already loaded domains whether it is already + available. */ + lastp = l10nfile_list; + for (retval = *l10nfile_list; retval != NULL; retval = retval->next) + if (retval->filename != NULL) + { + int compare = strcmp (retval->filename, abs_filename); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It's not in the list. */ + retval = NULL; + break; + } + + lastp = &retval->next; + } + + if (retval != NULL || do_allocate == 0) + { + free (abs_filename); + return retval; + } + + dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1); + + /* Allocate a new loaded_l10nfile. */ + retval = + (struct loaded_l10nfile *) + malloc (sizeof (*retval) + + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0)) + * sizeof (struct loaded_l10nfile *))); + if (retval == NULL) + return NULL; + + retval->filename = abs_filename; + + /* We set retval->data to NULL here; it is filled in later. + Setting retval->decided to 1 here means that retval does not + correspond to a real file (dirlist_count > 1) or is not worth + looking up (if an unnormalized codeset was specified). */ + retval->decided = (dirlist_count > 1 + || ((mask & XPG_CODESET) != 0 + && (mask & XPG_NORM_CODESET) != 0)); + retval->data = NULL; + + retval->next = *lastp; + *lastp = retval; + + entries = 0; + /* Recurse to fill the inheritance list of RETVAL. + If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL + entry does not correspond to a real file; retval->filename contains + colons. In this case we loop across all elements of DIRLIST and + across all bit patterns dominated by MASK. + If the DIRLIST is a single directory or entirely redundant (i.e. + DIRLIST_COUNT == 1), we loop across all bit patterns dominated by + MASK, excluding MASK itself. + In either case, we loop down from MASK to 0. This has the effect + that the extra bits in the locale name are dropped in this order: + first the modifier, then the territory, then the codeset, then the + normalized_codeset. */ + for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt) + if ((cnt & ~mask) == 0 + && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) + && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) + { + if (dirlist_count > 1) + { + /* Iterate over all elements of the DIRLIST. */ + char *dir = NULL; + + while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) + != NULL) + retval->successor[entries++] + = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, + cnt, language, territory, codeset, + normalized_codeset, modifier, special, + sponsor, revision, filename, 1); + } + else + retval->successor[entries++] + = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, + cnt, language, territory, codeset, + normalized_codeset, modifier, special, + sponsor, revision, filename, 1); + } + retval->successor[entries] = NULL; + + return retval; +} + +/* Normalize codeset name. There is no standard for the codeset + names. Normalization allows the user to use any of the common + names. The return value is dynamically allocated and has to be + freed by the caller. */ +const char * +_nl_normalize_codeset (const char *codeset, size_t name_len) +{ + int len = 0; + int only_digit = 1; + char *retval; + char *wp; + size_t cnt; + + for (cnt = 0; cnt < name_len; ++cnt) + if (isalnum ((unsigned char) codeset[cnt])) + { + ++len; + + if (isalpha ((unsigned char) codeset[cnt])) + only_digit = 0; + } + + retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); + + if (retval != NULL) + { + if (only_digit) + wp = stpcpy (retval, "iso"); + else + wp = retval; + + for (cnt = 0; cnt < name_len; ++cnt) + if (isalpha ((unsigned char) codeset[cnt])) + *wp++ = tolower ((unsigned char) codeset[cnt]); + else if (isdigit ((unsigned char) codeset[cnt])) + *wp++ = codeset[cnt]; + + *wp = '\0'; + } + + return (const char *) retval; +} + + +/* @@ begin of epilog @@ */ + +/* We don't want libintl.a to depend on any other library. So we + avoid the non-standard function stpcpy. In GNU C Library this + function is available, though. Also allow the symbol HAVE_STPCPY + to be defined. */ +#if !_LIBC && !HAVE_STPCPY +static char * +stpcpy (char *dest, const char *src) +{ + while ((*dest++ = *src++) != '\0') + /* Do nothing. */ ; + return dest - 1; +} +#endif diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in new file mode 100644 index 00000000..3be7eb99 --- /dev/null +++ b/intl/libgnuintl.h.in @@ -0,0 +1,383 @@ +/* Message catalogs for internationalization. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LIBINTL_H +#define _LIBINTL_H 1 + +#include + +/* The LC_MESSAGES locale category is the category used by the functions + gettext() and dgettext(). It is specified in POSIX, but not in ANSI C. + On systems that don't define it, use an arbitrary value instead. + On Solaris, defines __LOCALE_H (or _LOCALE_H in Solaris 2.5) + then includes (i.e. this file!) and then only defines + LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES + in this case. */ +#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun)) +# define LC_MESSAGES 1729 +#endif + +/* We define an additional symbol to signal that we use the GNU + implementation of gettext. */ +#define __USE_GNU_GETTEXT 1 + +/* Provide information about the supported file formats. Returns the + maximum minor revision number supported for a given major revision. */ +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \ + ((major) == 0 ? 1 : -1) + +/* Resolve a platform specific conflict on DJGPP. GNU gettext takes + precedence over _conio_gettext. */ +#ifdef __DJGPP__ +# undef gettext +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +/* We redirect the functions to those prefixed with "libintl_". This is + necessary, because some systems define gettext/textdomain/... in the C + library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer). + If we used the unprefixed names, there would be cases where the + definition in the C library would override the one in the libintl.so + shared library. Recall that on ELF systems, the symbols are looked + up in the following order: + 1. in the executable, + 2. in the shared libraries specified on the link command line, in order, + 3. in the dependencies of the shared libraries specified on the link + command line, + 4. in the dlopen()ed shared libraries, in the order in which they were + dlopen()ed. + The definition in the C library would override the one in libintl.so if + either + * -lc is given on the link command line and -lintl isn't, or + * -lc is given on the link command line before -lintl, or + * libintl.so is a dependency of a dlopen()ed shared library but not + linked to the executable at link time. + Since Solaris gettext() behaves differently than GNU gettext(), this + would be unacceptable. + + The redirection happens by default through macros in C, so that &gettext + is independent of the compilation unit, but through inline functions in + C++, in order not to interfere with the name mangling of class fields or + class methods called 'gettext'. */ + +/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS. + If he doesn't, we choose the method. A third possible method is + _INTL_REDIRECT_ASM, supported only by GCC. */ +#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS) +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) +# define _INTL_REDIRECT_ASM +# else +# ifdef __cplusplus +# define _INTL_REDIRECT_INLINE +# else +# define _INTL_REDIRECT_MACROS +# endif +# endif +#endif +/* Auxiliary macros. */ +#ifdef _INTL_REDIRECT_ASM +# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname)) +# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring +# define _INTL_STRINGIFY(prefix) #prefix +#else +# define _INTL_ASM(cname) +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_gettext (const char *__msgid); +static inline char *gettext (const char *__msgid) +{ + return libintl_gettext (__msgid); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define gettext libintl_gettext +#endif +extern char *gettext (const char *__msgid) + _INTL_ASM (libintl_gettext); +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dgettext (const char *__domainname, const char *__msgid); +static inline char *dgettext (const char *__domainname, const char *__msgid) +{ + return libintl_dgettext (__domainname, __msgid); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dgettext libintl_dgettext +#endif +extern char *dgettext (const char *__domainname, const char *__msgid) + _INTL_ASM (libintl_dgettext); +#endif + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dcgettext (const char *__domainname, const char *__msgid, + int __category); +static inline char *dcgettext (const char *__domainname, const char *__msgid, + int __category) +{ + return libintl_dcgettext (__domainname, __msgid, __category); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dcgettext libintl_dcgettext +#endif +extern char *dcgettext (const char *__domainname, const char *__msgid, + int __category) + _INTL_ASM (libintl_dcgettext); +#endif + + +/* Similar to `gettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +static inline char *ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n) +{ + return libintl_ngettext (__msgid1, __msgid2, __n); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define ngettext libintl_ngettext +#endif +extern char *ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n) + _INTL_ASM (libintl_ngettext); +#endif + +/* Similar to `dgettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dngettext (const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n); +static inline char *dngettext (const char *__domainname, const char *__msgid1, + const char *__msgid2, unsigned long int __n) +{ + return libintl_dngettext (__domainname, __msgid1, __msgid2, __n); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dngettext libintl_dngettext +#endif +extern char *dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n) + _INTL_ASM (libintl_dngettext); +#endif + +/* Similar to `dcgettext' but select the plural form corresponding to the + number N. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +static inline char *dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) +{ + return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define dcngettext libintl_dcngettext +#endif +extern char *dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) + _INTL_ASM (libintl_dcngettext); +#endif + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_textdomain (const char *__domainname); +static inline char *textdomain (const char *__domainname) +{ + return libintl_textdomain (__domainname); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define textdomain libintl_textdomain +#endif +extern char *textdomain (const char *__domainname) + _INTL_ASM (libintl_textdomain); +#endif + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_bindtextdomain (const char *__domainname, + const char *__dirname); +static inline char *bindtextdomain (const char *__domainname, + const char *__dirname) +{ + return libintl_bindtextdomain (__domainname, __dirname); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define bindtextdomain libintl_bindtextdomain +#endif +extern char *bindtextdomain (const char *__domainname, const char *__dirname) + _INTL_ASM (libintl_bindtextdomain); +#endif + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +#ifdef _INTL_REDIRECT_INLINE +extern char *libintl_bind_textdomain_codeset (const char *__domainname, + const char *__codeset); +static inline char *bind_textdomain_codeset (const char *__domainname, + const char *__codeset) +{ + return libintl_bind_textdomain_codeset (__domainname, __codeset); +} +#else +#ifdef _INTL_REDIRECT_MACROS +# define bind_textdomain_codeset libintl_bind_textdomain_codeset +#endif +extern char *bind_textdomain_codeset (const char *__domainname, + const char *__codeset) + _INTL_ASM (libintl_bind_textdomain_codeset); +#endif + + +/* Support for format strings with positions in *printf(), following the + POSIX/XSI specification. + Note: These replacements for the *printf() functions are visible only + in source files that #include or #include "gettext.h". + Packages that use *printf() in source files that don't refer to _() + or gettext() but for which the format string could be the return value + of _() or gettext() need to add this #include. Oh well. */ + +#if !@HAVE_POSIX_PRINTF@ + +#include +#include + +/* Get va_list. */ +#if __STDC__ || defined __cplusplus || defined _MSC_VER +# include +#else +# include +#endif + +#undef fprintf +#define fprintf libintl_fprintf +extern int fprintf (FILE *, const char *, ...); +#undef vfprintf +#define vfprintf libintl_vfprintf +extern int vfprintf (FILE *, const char *, va_list); + +#undef printf +#define printf libintl_printf +extern int printf (const char *, ...); +#undef vprintf +#define vprintf libintl_vprintf +extern int vprintf (const char *, va_list); + +#undef sprintf +#define sprintf libintl_sprintf +extern int sprintf (char *, const char *, ...); +#undef vsprintf +#define vsprintf libintl_vsprintf +extern int vsprintf (char *, const char *, va_list); + +#if @HAVE_SNPRINTF@ + +#undef snprintf +#define snprintf libintl_snprintf +extern int snprintf (char *, size_t, const char *, ...); +#undef vsnprintf +#define vsnprintf libintl_vsnprintf +extern int vsnprintf (char *, size_t, const char *, va_list); + +#endif + +#if @HAVE_ASPRINTF@ + +#undef asprintf +#define asprintf libintl_asprintf +extern int asprintf (char **, const char *, ...); +#undef vasprintf +#define vasprintf libintl_vasprintf +extern int vasprintf (char **, const char *, va_list); + +#endif + +#if @HAVE_WPRINTF@ + +#undef fwprintf +#define fwprintf libintl_fwprintf +extern int fwprintf (FILE *, const wchar_t *, ...); +#undef vfwprintf +#define vfwprintf libintl_vfwprintf +extern int vfwprintf (FILE *, const wchar_t *, va_list); + +#undef wprintf +#define wprintf libintl_wprintf +extern int wprintf (const wchar_t *, ...); +#undef vwprintf +#define vwprintf libintl_vwprintf +extern int vwprintf (const wchar_t *, va_list); + +#undef swprintf +#define swprintf libintl_swprintf +extern int swprintf (wchar_t *, size_t, const wchar_t *, ...); +#undef vswprintf +#define vswprintf libintl_vswprintf +extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); + +#endif + +#endif + + +/* Support for relocatable packages. */ + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +#define libintl_set_relocation_prefix libintl_set_relocation_prefix +extern void + libintl_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff --git a/intl/loadinfo.h b/intl/loadinfo.h new file mode 100644 index 00000000..65e5ebd1 --- /dev/null +++ b/intl/loadinfo.h @@ -0,0 +1,145 @@ +/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc. + 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 Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOADINFO_H +#define _LOADINFO_H 1 + +/* Declarations of locale dependent catalog lookup functions. + Implemented in + + localealias.c Possibly replace a locale name by another. + explodename.c Split a locale name into its various fields. + l10nflist.c Generate a list of filenames of possible message catalogs. + finddomain.c Find and open the relevant message catalogs. + + The main function _nl_find_domain() in finddomain.c is declared + in gettextP.h. + */ + +#ifndef internal_function +# define internal_function +#endif + +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + +/* Separator in PATH like lists of pathnames. */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define PATH_SEPARATOR ';' +#else + /* Unix */ +# define PATH_SEPARATOR ':' +#endif + +/* Encoding of locale name parts. */ +#define CEN_REVISION 1 +#define CEN_SPONSOR 2 +#define CEN_SPECIAL 4 +#define XPG_NORM_CODESET 8 +#define XPG_CODESET 16 +#define TERRITORY 32 +#define CEN_AUDIENCE 64 +#define XPG_MODIFIER 128 + +#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) +#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) + + +struct loaded_l10nfile +{ + const char *filename; + int decided; + + const void *data; + + struct loaded_l10nfile *next; + struct loaded_l10nfile *successor[1]; +}; + + +/* Normalize codeset name. There is no standard for the codeset + names. Normalization allows the user to use any of the common + names. The return value is dynamically allocated and has to be + freed by the caller. */ +extern const char *_nl_normalize_codeset (const char *codeset, + size_t name_len); + +/* Lookup a locale dependent file. + *L10NFILE_LIST denotes a pool of lookup results of locale dependent + files of the same kind, sorted in decreasing order of ->filename. + DIRLIST and DIRLIST_LEN are an argz list of directories in which to + look, containing at least one directory (i.e. DIRLIST_LEN > 0). + MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER, + SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as + produced by _nl_explode_name(). FILENAME is the filename suffix. + The return value is the lookup result, either found in *L10NFILE_LIST, + or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL. + If the return value is non-NULL, it is added to *L10NFILE_LIST, and + its ->next field denotes the chaining inside *L10NFILE_LIST, and + furthermore its ->successor[] field contains a list of other lookup + results from which this lookup result inherits. */ +extern struct loaded_l10nfile * +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, int mask, + const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate); + +/* Lookup the real locale name for a locale alias NAME, or NULL if + NAME is not a locale alias (but possibly a real locale name). + The return value is statically allocated and must not be freed. */ +extern const char *_nl_expand_alias (const char *name); + +/* Split a locale name NAME into its pieces: language, modifier, + territory, codeset, special, sponsor, revision. + NAME gets destructively modified: NUL bytes are inserted here and + there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY, + *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a + pointer into the old NAME string, or NULL. *NORMALIZED_CODESET + gets assigned the expanded *CODESET, if it is different from *CODESET; + this one is dynamically allocated and has to be freed by the caller. + The return value is a bitmask, where each bit corresponds to one + filled-in value: + XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER, + TERRITORY for *TERRITORY, + XPG_CODESET for *CODESET, + XPG_NORM_CODESET for *NORMALIZED_CODESET, + CEN_SPECIAL for *SPECIAL, + CEN_SPONSOR for *SPONSOR, + CEN_REVISION for *REVISION. + */ +extern int _nl_explode_name (char *name, const char **language, + const char **modifier, const char **territory, + const char **codeset, + const char **normalized_codeset, + const char **special, const char **sponsor, + const char **revision); + +/* Split a locale name NAME into a leading language part and all the + rest. Return a pointer to the first character after the language, + i.e. to the first byte of the rest. */ +extern char *_nl_find_language (const char *name); + +#endif /* loadinfo.h */ diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c new file mode 100644 index 00000000..99c51b4c --- /dev/null +++ b/intl/loadmsgcat.c @@ -0,0 +1,1420 @@ +/* Load needed message catalogs. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include +#include +#include + +#ifdef __GNUC__ +# undef alloca +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +#include +#include + +#if defined HAVE_UNISTD_H || defined _LIBC +# include +#endif + +#ifdef _LIBC +# include +# include +#endif + +#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || (defined _LIBC && defined _POSIX_MAPPED_FILES) +# include +# undef HAVE_MMAP +# define HAVE_MMAP 1 +#else +# undef HAVE_MMAP +#endif + +#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC +# include +#endif +#if defined HAVE_INTTYPES_H || defined _LIBC +# include +#endif + +#include "gmo.h" +#include "gettextP.h" +#include "hash-string.h" +#include "plural-exp.h" + +#ifdef _LIBC +# include "../locale/localeinfo.h" +#endif + +/* Provide fallback values for macros that ought to be defined in . + Note that our fallback values need not be literal strings, because we don't + use them with preprocessor string concatenation. */ +#if !defined PRId8 || PRI_MACROS_BROKEN +# undef PRId8 +# define PRId8 "d" +#endif +#if !defined PRIi8 || PRI_MACROS_BROKEN +# undef PRIi8 +# define PRIi8 "i" +#endif +#if !defined PRIo8 || PRI_MACROS_BROKEN +# undef PRIo8 +# define PRIo8 "o" +#endif +#if !defined PRIu8 || PRI_MACROS_BROKEN +# undef PRIu8 +# define PRIu8 "u" +#endif +#if !defined PRIx8 || PRI_MACROS_BROKEN +# undef PRIx8 +# define PRIx8 "x" +#endif +#if !defined PRIX8 || PRI_MACROS_BROKEN +# undef PRIX8 +# define PRIX8 "X" +#endif +#if !defined PRId16 || PRI_MACROS_BROKEN +# undef PRId16 +# define PRId16 "d" +#endif +#if !defined PRIi16 || PRI_MACROS_BROKEN +# undef PRIi16 +# define PRIi16 "i" +#endif +#if !defined PRIo16 || PRI_MACROS_BROKEN +# undef PRIo16 +# define PRIo16 "o" +#endif +#if !defined PRIu16 || PRI_MACROS_BROKEN +# undef PRIu16 +# define PRIu16 "u" +#endif +#if !defined PRIx16 || PRI_MACROS_BROKEN +# undef PRIx16 +# define PRIx16 "x" +#endif +#if !defined PRIX16 || PRI_MACROS_BROKEN +# undef PRIX16 +# define PRIX16 "X" +#endif +#if !defined PRId32 || PRI_MACROS_BROKEN +# undef PRId32 +# define PRId32 "d" +#endif +#if !defined PRIi32 || PRI_MACROS_BROKEN +# undef PRIi32 +# define PRIi32 "i" +#endif +#if !defined PRIo32 || PRI_MACROS_BROKEN +# undef PRIo32 +# define PRIo32 "o" +#endif +#if !defined PRIu32 || PRI_MACROS_BROKEN +# undef PRIu32 +# define PRIu32 "u" +#endif +#if !defined PRIx32 || PRI_MACROS_BROKEN +# undef PRIx32 +# define PRIx32 "x" +#endif +#if !defined PRIX32 || PRI_MACROS_BROKEN +# undef PRIX32 +# define PRIX32 "X" +#endif +#if !defined PRId64 || PRI_MACROS_BROKEN +# undef PRId64 +# define PRId64 (sizeof (long) == 8 ? "ld" : "lld") +#endif +#if !defined PRIi64 || PRI_MACROS_BROKEN +# undef PRIi64 +# define PRIi64 (sizeof (long) == 8 ? "li" : "lli") +#endif +#if !defined PRIo64 || PRI_MACROS_BROKEN +# undef PRIo64 +# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo") +#endif +#if !defined PRIu64 || PRI_MACROS_BROKEN +# undef PRIu64 +# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu") +#endif +#if !defined PRIx64 || PRI_MACROS_BROKEN +# undef PRIx64 +# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx") +#endif +#if !defined PRIX64 || PRI_MACROS_BROKEN +# undef PRIX64 +# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX") +#endif +#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN +# undef PRIdLEAST8 +# define PRIdLEAST8 "d" +#endif +#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN +# undef PRIiLEAST8 +# define PRIiLEAST8 "i" +#endif +#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN +# undef PRIoLEAST8 +# define PRIoLEAST8 "o" +#endif +#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN +# undef PRIuLEAST8 +# define PRIuLEAST8 "u" +#endif +#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN +# undef PRIxLEAST8 +# define PRIxLEAST8 "x" +#endif +#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN +# undef PRIXLEAST8 +# define PRIXLEAST8 "X" +#endif +#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN +# undef PRIdLEAST16 +# define PRIdLEAST16 "d" +#endif +#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN +# undef PRIiLEAST16 +# define PRIiLEAST16 "i" +#endif +#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN +# undef PRIoLEAST16 +# define PRIoLEAST16 "o" +#endif +#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN +# undef PRIuLEAST16 +# define PRIuLEAST16 "u" +#endif +#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN +# undef PRIxLEAST16 +# define PRIxLEAST16 "x" +#endif +#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN +# undef PRIXLEAST16 +# define PRIXLEAST16 "X" +#endif +#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN +# undef PRIdLEAST32 +# define PRIdLEAST32 "d" +#endif +#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN +# undef PRIiLEAST32 +# define PRIiLEAST32 "i" +#endif +#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN +# undef PRIoLEAST32 +# define PRIoLEAST32 "o" +#endif +#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN +# undef PRIuLEAST32 +# define PRIuLEAST32 "u" +#endif +#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN +# undef PRIxLEAST32 +# define PRIxLEAST32 "x" +#endif +#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN +# undef PRIXLEAST32 +# define PRIXLEAST32 "X" +#endif +#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN +# undef PRIdLEAST64 +# define PRIdLEAST64 PRId64 +#endif +#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN +# undef PRIiLEAST64 +# define PRIiLEAST64 PRIi64 +#endif +#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN +# undef PRIoLEAST64 +# define PRIoLEAST64 PRIo64 +#endif +#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN +# undef PRIuLEAST64 +# define PRIuLEAST64 PRIu64 +#endif +#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN +# undef PRIxLEAST64 +# define PRIxLEAST64 PRIx64 +#endif +#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN +# undef PRIXLEAST64 +# define PRIXLEAST64 PRIX64 +#endif +#if !defined PRIdFAST8 || PRI_MACROS_BROKEN +# undef PRIdFAST8 +# define PRIdFAST8 "d" +#endif +#if !defined PRIiFAST8 || PRI_MACROS_BROKEN +# undef PRIiFAST8 +# define PRIiFAST8 "i" +#endif +#if !defined PRIoFAST8 || PRI_MACROS_BROKEN +# undef PRIoFAST8 +# define PRIoFAST8 "o" +#endif +#if !defined PRIuFAST8 || PRI_MACROS_BROKEN +# undef PRIuFAST8 +# define PRIuFAST8 "u" +#endif +#if !defined PRIxFAST8 || PRI_MACROS_BROKEN +# undef PRIxFAST8 +# define PRIxFAST8 "x" +#endif +#if !defined PRIXFAST8 || PRI_MACROS_BROKEN +# undef PRIXFAST8 +# define PRIXFAST8 "X" +#endif +#if !defined PRIdFAST16 || PRI_MACROS_BROKEN +# undef PRIdFAST16 +# define PRIdFAST16 "d" +#endif +#if !defined PRIiFAST16 || PRI_MACROS_BROKEN +# undef PRIiFAST16 +# define PRIiFAST16 "i" +#endif +#if !defined PRIoFAST16 || PRI_MACROS_BROKEN +# undef PRIoFAST16 +# define PRIoFAST16 "o" +#endif +#if !defined PRIuFAST16 || PRI_MACROS_BROKEN +# undef PRIuFAST16 +# define PRIuFAST16 "u" +#endif +#if !defined PRIxFAST16 || PRI_MACROS_BROKEN +# undef PRIxFAST16 +# define PRIxFAST16 "x" +#endif +#if !defined PRIXFAST16 || PRI_MACROS_BROKEN +# undef PRIXFAST16 +# define PRIXFAST16 "X" +#endif +#if !defined PRIdFAST32 || PRI_MACROS_BROKEN +# undef PRIdFAST32 +# define PRIdFAST32 "d" +#endif +#if !defined PRIiFAST32 || PRI_MACROS_BROKEN +# undef PRIiFAST32 +# define PRIiFAST32 "i" +#endif +#if !defined PRIoFAST32 || PRI_MACROS_BROKEN +# undef PRIoFAST32 +# define PRIoFAST32 "o" +#endif +#if !defined PRIuFAST32 || PRI_MACROS_BROKEN +# undef PRIuFAST32 +# define PRIuFAST32 "u" +#endif +#if !defined PRIxFAST32 || PRI_MACROS_BROKEN +# undef PRIxFAST32 +# define PRIxFAST32 "x" +#endif +#if !defined PRIXFAST32 || PRI_MACROS_BROKEN +# undef PRIXFAST32 +# define PRIXFAST32 "X" +#endif +#if !defined PRIdFAST64 || PRI_MACROS_BROKEN +# undef PRIdFAST64 +# define PRIdFAST64 PRId64 +#endif +#if !defined PRIiFAST64 || PRI_MACROS_BROKEN +# undef PRIiFAST64 +# define PRIiFAST64 PRIi64 +#endif +#if !defined PRIoFAST64 || PRI_MACROS_BROKEN +# undef PRIoFAST64 +# define PRIoFAST64 PRIo64 +#endif +#if !defined PRIuFAST64 || PRI_MACROS_BROKEN +# undef PRIuFAST64 +# define PRIuFAST64 PRIu64 +#endif +#if !defined PRIxFAST64 || PRI_MACROS_BROKEN +# undef PRIxFAST64 +# define PRIxFAST64 PRIx64 +#endif +#if !defined PRIXFAST64 || PRI_MACROS_BROKEN +# undef PRIXFAST64 +# define PRIXFAST64 PRIX64 +#endif +#if !defined PRIdMAX || PRI_MACROS_BROKEN +# undef PRIdMAX +# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld") +#endif +#if !defined PRIiMAX || PRI_MACROS_BROKEN +# undef PRIiMAX +# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli") +#endif +#if !defined PRIoMAX || PRI_MACROS_BROKEN +# undef PRIoMAX +# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo") +#endif +#if !defined PRIuMAX || PRI_MACROS_BROKEN +# undef PRIuMAX +# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu") +#endif +#if !defined PRIxMAX || PRI_MACROS_BROKEN +# undef PRIxMAX +# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx") +#endif +#if !defined PRIXMAX || PRI_MACROS_BROKEN +# undef PRIXMAX +# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX") +#endif +#if !defined PRIdPTR || PRI_MACROS_BROKEN +# undef PRIdPTR +# define PRIdPTR \ + (sizeof (void *) == sizeof (long) ? "ld" : \ + sizeof (void *) == sizeof (int) ? "d" : \ + "lld") +#endif +#if !defined PRIiPTR || PRI_MACROS_BROKEN +# undef PRIiPTR +# define PRIiPTR \ + (sizeof (void *) == sizeof (long) ? "li" : \ + sizeof (void *) == sizeof (int) ? "i" : \ + "lli") +#endif +#if !defined PRIoPTR || PRI_MACROS_BROKEN +# undef PRIoPTR +# define PRIoPTR \ + (sizeof (void *) == sizeof (long) ? "lo" : \ + sizeof (void *) == sizeof (int) ? "o" : \ + "llo") +#endif +#if !defined PRIuPTR || PRI_MACROS_BROKEN +# undef PRIuPTR +# define PRIuPTR \ + (sizeof (void *) == sizeof (long) ? "lu" : \ + sizeof (void *) == sizeof (int) ? "u" : \ + "llu") +#endif +#if !defined PRIxPTR || PRI_MACROS_BROKEN +# undef PRIxPTR +# define PRIxPTR \ + (sizeof (void *) == sizeof (long) ? "lx" : \ + sizeof (void *) == sizeof (int) ? "x" : \ + "llx") +#endif +#if !defined PRIXPTR || PRI_MACROS_BROKEN +# undef PRIXPTR +# define PRIXPTR \ + (sizeof (void *) == sizeof (long) ? "lX" : \ + sizeof (void *) == sizeof (int) ? "X" : \ + "llX") +#endif + +/* @@ end of prolog @@ */ + +#ifdef _LIBC +/* Rename the non ISO C functions. This is required by the standard + because some ISO C functions will require linking with this object + file and the name space must not be polluted. */ +# define open __open +# define close __close +# define read __read +# define mmap __mmap +# define munmap __munmap +#endif + +/* For those losing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +# define freea(p) /* nothing */ +#else +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif + +/* For systems that distinguish between text and binary I/O. + O_BINARY is usually declared in . */ +#if !defined O_BINARY && defined _O_BINARY + /* For MSC-compatible compilers. */ +# define O_BINARY _O_BINARY +# define O_TEXT _O_TEXT +#endif +#ifdef __BEOS__ + /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +# undef O_BINARY +# undef O_TEXT +#endif +/* On reasonable systems, binary I/O is the default. */ +#ifndef O_BINARY +# define O_BINARY 0 +#endif + + +/* We need a sign, whether a new catalog was loaded, which can be associated + with all translations. This is important if the translations are + cached by one of GCC's features. */ +int _nl_msg_cat_cntr; + + +/* Expand a system dependent string segment. Return NULL if unsupported. */ +static const char * +get_sysdep_segment_value (const char *name) +{ + /* Test for an ISO C 99 section 7.8.1 format string directive. + Syntax: + P R I { d | i | o | u | x | X } + { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */ + /* We don't use a table of 14 times 6 'const char *' strings here, because + data relocations cost startup time. */ + if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I') + { + if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u' + || name[3] == 'x' || name[3] == 'X') + { + if (name[4] == '8' && name[5] == '\0') + { + if (name[3] == 'd') + return PRId8; + if (name[3] == 'i') + return PRIi8; + if (name[3] == 'o') + return PRIo8; + if (name[3] == 'u') + return PRIu8; + if (name[3] == 'x') + return PRIx8; + if (name[3] == 'X') + return PRIX8; + abort (); + } + if (name[4] == '1' && name[5] == '6' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId16; + if (name[3] == 'i') + return PRIi16; + if (name[3] == 'o') + return PRIo16; + if (name[3] == 'u') + return PRIu16; + if (name[3] == 'x') + return PRIx16; + if (name[3] == 'X') + return PRIX16; + abort (); + } + if (name[4] == '3' && name[5] == '2' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId32; + if (name[3] == 'i') + return PRIi32; + if (name[3] == 'o') + return PRIo32; + if (name[3] == 'u') + return PRIu32; + if (name[3] == 'x') + return PRIx32; + if (name[3] == 'X') + return PRIX32; + abort (); + } + if (name[4] == '6' && name[5] == '4' && name[6] == '\0') + { + if (name[3] == 'd') + return PRId64; + if (name[3] == 'i') + return PRIi64; + if (name[3] == 'o') + return PRIo64; + if (name[3] == 'u') + return PRIu64; + if (name[3] == 'x') + return PRIx64; + if (name[3] == 'X') + return PRIX64; + abort (); + } + if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A' + && name[7] == 'S' && name[8] == 'T') + { + if (name[9] == '8' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST8; + if (name[3] == 'i') + return PRIiLEAST8; + if (name[3] == 'o') + return PRIoLEAST8; + if (name[3] == 'u') + return PRIuLEAST8; + if (name[3] == 'x') + return PRIxLEAST8; + if (name[3] == 'X') + return PRIXLEAST8; + abort (); + } + if (name[9] == '1' && name[10] == '6' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST16; + if (name[3] == 'i') + return PRIiLEAST16; + if (name[3] == 'o') + return PRIoLEAST16; + if (name[3] == 'u') + return PRIuLEAST16; + if (name[3] == 'x') + return PRIxLEAST16; + if (name[3] == 'X') + return PRIXLEAST16; + abort (); + } + if (name[9] == '3' && name[10] == '2' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST32; + if (name[3] == 'i') + return PRIiLEAST32; + if (name[3] == 'o') + return PRIoLEAST32; + if (name[3] == 'u') + return PRIuLEAST32; + if (name[3] == 'x') + return PRIxLEAST32; + if (name[3] == 'X') + return PRIXLEAST32; + abort (); + } + if (name[9] == '6' && name[10] == '4' && name[11] == '\0') + { + if (name[3] == 'd') + return PRIdLEAST64; + if (name[3] == 'i') + return PRIiLEAST64; + if (name[3] == 'o') + return PRIoLEAST64; + if (name[3] == 'u') + return PRIuLEAST64; + if (name[3] == 'x') + return PRIxLEAST64; + if (name[3] == 'X') + return PRIXLEAST64; + abort (); + } + } + if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S' + && name[7] == 'T') + { + if (name[8] == '8' && name[9] == '\0') + { + if (name[3] == 'd') + return PRIdFAST8; + if (name[3] == 'i') + return PRIiFAST8; + if (name[3] == 'o') + return PRIoFAST8; + if (name[3] == 'u') + return PRIuFAST8; + if (name[3] == 'x') + return PRIxFAST8; + if (name[3] == 'X') + return PRIXFAST8; + abort (); + } + if (name[8] == '1' && name[9] == '6' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST16; + if (name[3] == 'i') + return PRIiFAST16; + if (name[3] == 'o') + return PRIoFAST16; + if (name[3] == 'u') + return PRIuFAST16; + if (name[3] == 'x') + return PRIxFAST16; + if (name[3] == 'X') + return PRIXFAST16; + abort (); + } + if (name[8] == '3' && name[9] == '2' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST32; + if (name[3] == 'i') + return PRIiFAST32; + if (name[3] == 'o') + return PRIoFAST32; + if (name[3] == 'u') + return PRIuFAST32; + if (name[3] == 'x') + return PRIxFAST32; + if (name[3] == 'X') + return PRIXFAST32; + abort (); + } + if (name[8] == '6' && name[9] == '4' && name[10] == '\0') + { + if (name[3] == 'd') + return PRIdFAST64; + if (name[3] == 'i') + return PRIiFAST64; + if (name[3] == 'o') + return PRIoFAST64; + if (name[3] == 'u') + return PRIuFAST64; + if (name[3] == 'x') + return PRIxFAST64; + if (name[3] == 'X') + return PRIXFAST64; + abort (); + } + } + if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X' + && name[7] == '\0') + { + if (name[3] == 'd') + return PRIdMAX; + if (name[3] == 'i') + return PRIiMAX; + if (name[3] == 'o') + return PRIoMAX; + if (name[3] == 'u') + return PRIuMAX; + if (name[3] == 'x') + return PRIxMAX; + if (name[3] == 'X') + return PRIXMAX; + abort (); + } + if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R' + && name[7] == '\0') + { + if (name[3] == 'd') + return PRIdPTR; + if (name[3] == 'i') + return PRIiPTR; + if (name[3] == 'o') + return PRIoPTR; + if (name[3] == 'u') + return PRIuPTR; + if (name[3] == 'x') + return PRIxPTR; + if (name[3] == 'X') + return PRIXPTR; + abort (); + } + } + } + /* Test for a glibc specific printf() format directive flag. */ + if (name[0] == 'I' && name[1] == '\0') + { +#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) + /* The 'I' flag, in numeric format directives, replaces ASCII digits + with the 'outdigits' defined in the LC_CTYPE locale facet. This is + used for Farsi (Persian) and maybe Arabic. */ + return "I"; +#else + return ""; +#endif + } + /* Other system dependent strings are not valid. */ + return NULL; +} + +/* Initialize the codeset dependent parts of an opened message catalog. + Return the header entry. */ +const char * +internal_function +_nl_init_domain_conv (struct loaded_l10nfile *domain_file, + struct loaded_domain *domain, + struct binding *domainbinding) +{ + /* Find out about the character set the file is encoded with. + This can be found (in textual form) in the entry "". If this + entry does not exist or if this does not contain the `charset=' + information, we will assume the charset matches the one the + current locale and we don't have to perform any conversion. */ + char *nullentry; + size_t nullentrylen; + + /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ + domain->codeset_cntr = + (domainbinding != NULL ? domainbinding->codeset_cntr : 0); +#ifdef _LIBC + domain->conv = (__gconv_t) -1; +#else +# if HAVE_ICONV + domain->conv = (iconv_t) -1; +# endif +#endif + domain->conv_tab = NULL; + + /* Get the header entry. */ + nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); + + if (nullentry != NULL) + { +#if defined _LIBC || HAVE_ICONV + const char *charsetstr; + + charsetstr = strstr (nullentry, "charset="); + if (charsetstr != NULL) + { + size_t len; + char *charset; + const char *outcharset; + + charsetstr += strlen ("charset="); + len = strcspn (charsetstr, " \t\n"); + + charset = (char *) alloca (len + 1); +# if defined _LIBC || HAVE_MEMPCPY + *((char *) mempcpy (charset, charsetstr, len)) = '\0'; +# else + memcpy (charset, charsetstr, len); + charset[len] = '\0'; +# endif + + /* The output charset should normally be determined by the + locale. But sometimes the locale is not used or not correctly + set up, so we provide a possibility for the user to override + this. Moreover, the value specified through + bind_textdomain_codeset overrides both. */ + if (domainbinding != NULL && domainbinding->codeset != NULL) + outcharset = domainbinding->codeset; + else + { + outcharset = getenv ("OUTPUT_CHARSET"); + if (outcharset == NULL || outcharset[0] == '\0') + { +# ifdef _LIBC + outcharset = _NL_CURRENT (LC_CTYPE, CODESET); +# else +# if HAVE_ICONV + extern const char *locale_charset (void); + outcharset = locale_charset (); +# endif +# endif + } + } + +# ifdef _LIBC + /* We always want to use transliteration. */ + outcharset = norm_add_slashes (outcharset, "TRANSLIT"); + charset = norm_add_slashes (charset, NULL); + if (__gconv_open (outcharset, charset, &domain->conv, + GCONV_AVOID_NOCONV) + != __GCONV_OK) + domain->conv = (__gconv_t) -1; +# else +# if HAVE_ICONV + /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, + we want to use transliteration. */ +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 + if (strchr (outcharset, '/') == NULL) + { + char *tmp; + + len = strlen (outcharset); + tmp = (char *) alloca (len + 10 + 1); + memcpy (tmp, outcharset, len); + memcpy (tmp + len, "//TRANSLIT", 10 + 1); + outcharset = tmp; + + domain->conv = iconv_open (outcharset, charset); + + freea (outcharset); + } + else +# endif + domain->conv = iconv_open (outcharset, charset); +# endif +# endif + + freea (charset); + } +#endif /* _LIBC || HAVE_ICONV */ + } + + return nullentry; +} + +/* Frees the codeset dependent parts of an opened message catalog. */ +void +internal_function +_nl_free_domain_conv (struct loaded_domain *domain) +{ + if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) + free (domain->conv_tab); + +#ifdef _LIBC + if (domain->conv != (__gconv_t) -1) + __gconv_close (domain->conv); +#else +# if HAVE_ICONV + if (domain->conv != (iconv_t) -1) + iconv_close (domain->conv); +# endif +#endif +} + +/* Load the message catalogs specified by FILENAME. If it is no valid + message catalog do nothing. */ +void +internal_function +_nl_load_domain (struct loaded_l10nfile *domain_file, + struct binding *domainbinding) +{ + int fd; + size_t size; +#ifdef _LIBC + struct stat64 st; +#else + struct stat st; +#endif + struct mo_file_header *data = (struct mo_file_header *) -1; + int use_mmap = 0; + struct loaded_domain *domain; + int revision; + const char *nullentry; + + domain_file->decided = 1; + domain_file->data = NULL; + + /* Note that it would be useless to store domainbinding in domain_file + because domainbinding might be == NULL now but != NULL later (after + a call to bind_textdomain_codeset). */ + + /* If the record does not represent a valid locale the FILENAME + might be NULL. This can happen when according to the given + specification the locale file name is different for XPG and CEN + syntax. */ + if (domain_file->filename == NULL) + return; + + /* Try to open the addressed file. */ + fd = open (domain_file->filename, O_RDONLY | O_BINARY); + if (fd == -1) + return; + + /* We must know about the size of the file. */ + if ( +#ifdef _LIBC + __builtin_expect (fstat64 (fd, &st) != 0, 0) +#else + __builtin_expect (fstat (fd, &st) != 0, 0) +#endif + || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) + || __builtin_expect (size < sizeof (struct mo_file_header), 0)) + { + /* Something went wrong. */ + close (fd); + return; + } + +#ifdef HAVE_MMAP + /* Now we are ready to load the file. If mmap() is available we try + this first. If not available or it failed we try to load it. */ + data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, + MAP_PRIVATE, fd, 0); + + if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) + { + /* mmap() call was successful. */ + close (fd); + use_mmap = 1; + } +#endif + + /* If the data is not yet available (i.e. mmap'ed) we try to load + it manually. */ + if (data == (struct mo_file_header *) -1) + { + size_t to_read; + char *read_ptr; + + data = (struct mo_file_header *) malloc (size); + if (data == NULL) + return; + + to_read = size; + read_ptr = (char *) data; + do + { + long int nb = (long int) read (fd, read_ptr, to_read); + if (nb <= 0) + { +#ifdef EINTR + if (nb == -1 && errno == EINTR) + continue; +#endif + close (fd); + return; + } + read_ptr += nb; + to_read -= nb; + } + while (to_read > 0); + + close (fd); + } + + /* Using the magic number we can test whether it really is a message + catalog file. */ + if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, + 0)) + { + /* The magic number is wrong: not a message catalog file. */ +#ifdef HAVE_MMAP + if (use_mmap) + munmap ((caddr_t) data, size); + else +#endif + free (data); + return; + } + + domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); + if (domain == NULL) + return; + domain_file->data = domain; + + domain->data = (char *) data; + domain->use_mmap = use_mmap; + domain->mmap_size = size; + domain->must_swap = data->magic != _MAGIC; + domain->malloced = NULL; + + /* Fill in the information about the available tables. */ + revision = W (domain->must_swap, data->revision); + /* We support only the major revisions 0 and 1. */ + switch (revision >> 16) + { + case 0: + case 1: + domain->nstrings = W (domain->must_swap, data->nstrings); + domain->orig_tab = (const struct string_desc *) + ((char *) data + W (domain->must_swap, data->orig_tab_offset)); + domain->trans_tab = (const struct string_desc *) + ((char *) data + W (domain->must_swap, data->trans_tab_offset)); + domain->hash_size = W (domain->must_swap, data->hash_tab_size); + domain->hash_tab = + (domain->hash_size > 2 + ? (const nls_uint32 *) + ((char *) data + W (domain->must_swap, data->hash_tab_offset)) + : NULL); + domain->must_swap_hash_tab = domain->must_swap; + + /* Now dispatch on the minor revision. */ + switch (revision & 0xffff) + { + case 0: + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + break; + case 1: + default: + { + nls_uint32 n_sysdep_strings; + + if (domain->hash_tab == NULL) + /* This is invalid. These minor revisions need a hash table. */ + goto invalid; + + n_sysdep_strings = + W (domain->must_swap, data->n_sysdep_strings); + if (n_sysdep_strings > 0) + { + nls_uint32 n_sysdep_segments; + const struct sysdep_segment *sysdep_segments; + const char **sysdep_segment_values; + const nls_uint32 *orig_sysdep_tab; + const nls_uint32 *trans_sysdep_tab; + nls_uint32 n_inmem_sysdep_strings; + size_t memneed; + char *mem; + struct sysdep_string_desc *inmem_orig_sysdep_tab; + struct sysdep_string_desc *inmem_trans_sysdep_tab; + nls_uint32 *inmem_hash_tab; + unsigned int i, j; + + /* Get the values of the system dependent segments. */ + n_sysdep_segments = + W (domain->must_swap, data->n_sysdep_segments); + sysdep_segments = (const struct sysdep_segment *) + ((char *) data + + W (domain->must_swap, data->sysdep_segments_offset)); + sysdep_segment_values = + alloca (n_sysdep_segments * sizeof (const char *)); + for (i = 0; i < n_sysdep_segments; i++) + { + const char *name = + (char *) data + + W (domain->must_swap, sysdep_segments[i].offset); + nls_uint32 namelen = + W (domain->must_swap, sysdep_segments[i].length); + + if (!(namelen > 0 && name[namelen - 1] == '\0')) + { + freea (sysdep_segment_values); + goto invalid; + } + + sysdep_segment_values[i] = get_sysdep_segment_value (name); + } + + orig_sysdep_tab = (const nls_uint32 *) + ((char *) data + + W (domain->must_swap, data->orig_sysdep_tab_offset)); + trans_sysdep_tab = (const nls_uint32 *) + ((char *) data + + W (domain->must_swap, data->trans_sysdep_tab_offset)); + + /* Compute the amount of additional memory needed for the + system dependent strings and the augmented hash table. + At the same time, also drop string pairs which refer to + an undefined system dependent segment. */ + n_inmem_sysdep_strings = 0; + memneed = domain->hash_size * sizeof (nls_uint32); + for (i = 0; i < n_sysdep_strings; i++) + { + int valid = 1; + size_t needs[2]; + + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + size_t need = 0; + const struct segment_pair *p = sysdep_string->segments; + + if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) + { + nls_uint32 sysdepref; + + need += W (domain->must_swap, p->segsize); + + sysdepref = W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + if (sysdepref >= n_sysdep_segments) + { + /* Invalid. */ + freea (sysdep_segment_values); + goto invalid; + } + + if (sysdep_segment_values[sysdepref] == NULL) + { + /* This particular string pair is invalid. */ + valid = 0; + break; + } + + need += strlen (sysdep_segment_values[sysdepref]); + } + + needs[j] = need; + if (!valid) + break; + } + + if (valid) + { + n_inmem_sysdep_strings++; + memneed += needs[0] + needs[1]; + } + } + memneed += 2 * n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + + if (n_inmem_sysdep_strings > 0) + { + unsigned int k; + + /* Allocate additional memory. */ + mem = (char *) malloc (memneed); + if (mem == NULL) + goto invalid; + + domain->malloced = mem; + inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_hash_tab = (nls_uint32 *) mem; + mem += domain->hash_size * sizeof (nls_uint32); + + /* Compute the system dependent strings. */ + k = 0; + for (i = 0; i < n_sysdep_strings; i++) + { + int valid = 1; + + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const struct segment_pair *p = + sysdep_string->segments; + + if (W (domain->must_swap, p->sysdepref) + != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) + { + nls_uint32 sysdepref; + + sysdepref = + W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + if (sysdep_segment_values[sysdepref] == NULL) + { + /* This particular string pair is + invalid. */ + valid = 0; + break; + } + } + + if (!valid) + break; + } + + if (valid) + { + for (j = 0; j < 2; j++) + { + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const char *static_segments = + (char *) data + + W (domain->must_swap, sysdep_string->offset); + const struct segment_pair *p = + sysdep_string->segments; + + /* Concatenate the segments, and fill + inmem_orig_sysdep_tab[k] (for j == 0) and + inmem_trans_sysdep_tab[k] (for j == 1). */ + + struct sysdep_string_desc *inmem_tab_entry = + (j == 0 + ? inmem_orig_sysdep_tab + : inmem_trans_sysdep_tab) + + k; + + if (W (domain->must_swap, p->sysdepref) + == SEGMENTS_END) + { + /* Only one static segment. */ + inmem_tab_entry->length = + W (domain->must_swap, p->segsize); + inmem_tab_entry->pointer = static_segments; + } + else + { + inmem_tab_entry->pointer = mem; + + for (p = sysdep_string->segments;; p++) + { + nls_uint32 segsize = + W (domain->must_swap, p->segsize); + nls_uint32 sysdepref = + W (domain->must_swap, p->sysdepref); + size_t n; + + if (segsize > 0) + { + memcpy (mem, static_segments, segsize); + mem += segsize; + static_segments += segsize; + } + + if (sysdepref == SEGMENTS_END) + break; + + n = strlen (sysdep_segment_values[sysdepref]); + memcpy (mem, sysdep_segment_values[sysdepref], n); + mem += n; + } + + inmem_tab_entry->length = + mem - inmem_tab_entry->pointer; + } + } + + k++; + } + } + if (k != n_inmem_sysdep_strings) + abort (); + + /* Compute the augmented hash table. */ + for (i = 0; i < domain->hash_size; i++) + inmem_hash_tab[i] = + W (domain->must_swap_hash_tab, domain->hash_tab[i]); + for (i = 0; i < n_inmem_sysdep_strings; i++) + { + const char *msgid = inmem_orig_sysdep_tab[i].pointer; + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = + 1 + (hash_val % (domain->hash_size - 2)); + + for (;;) + { + if (inmem_hash_tab[idx] == 0) + { + /* Hash table entry is empty. Use it. */ + inmem_hash_tab[idx] = 1 + domain->nstrings + i; + break; + } + + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + } + } + + domain->n_sysdep_strings = n_inmem_sysdep_strings; + domain->orig_sysdep_tab = inmem_orig_sysdep_tab; + domain->trans_sysdep_tab = inmem_trans_sysdep_tab; + + domain->hash_tab = inmem_hash_tab; + domain->must_swap_hash_tab = 0; + } + else + { + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + } + + freea (sysdep_segment_values); + } + else + { + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + } + } + break; + } + break; + default: + /* This is an invalid revision. */ + invalid: + /* This is an invalid .mo file. */ + if (domain->malloced) + free (domain->malloced); +#ifdef HAVE_MMAP + if (use_mmap) + munmap ((caddr_t) data, size); + else +#endif + free (data); + free (domain); + domain_file->data = NULL; + return; + } + + /* Now initialize the character set converter from the character set + the file is encoded with (found in the header entry) to the domain's + specified character set or the locale's character set. */ + nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); + + /* Also look for a plural specification. */ + EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals); +} + + +#ifdef _LIBC +void +internal_function +_nl_unload_domain (struct loaded_domain *domain) +{ + if (domain->plural != &__gettext_germanic_plural) + __gettext_free_exp (domain->plural); + + _nl_free_domain_conv (domain); + + if (domain->malloced) + free (domain->malloced); + +# ifdef _POSIX_MAPPED_FILES + if (domain->use_mmap) + munmap ((caddr_t) domain->data, domain->mmap_size); + else +# endif /* _POSIX_MAPPED_FILES */ + free ((void *) domain->data); + + free (domain); +} +#endif diff --git a/intl/localcharset.c b/intl/localcharset.c new file mode 100644 index 00000000..4865f103 --- /dev/null +++ b/intl/localcharset.c @@ -0,0 +1,398 @@ +/* Determine a canonical name for the current locale's character encoding. + + Copyright (C) 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Bruno Haible . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "localcharset.h" + +#if HAVE_STDDEF_H +# include +#endif + +#include +#if HAVE_STRING_H +# include +#else +# include +#endif +#if HAVE_STDLIB_H +# include +#endif + +#if defined _WIN32 || defined __WIN32__ +# undef WIN32 /* avoid warning on mingw32 */ +# define WIN32 +#endif + +#if defined __EMX__ +/* Assume EMX program runs on OS/2, even if compiled under DOS. */ +# define OS2 +#endif + +#if !defined WIN32 +# if HAVE_LANGINFO_CODESET +# include +# else +# if HAVE_SETLOCALE +# include +# endif +# endif +#elif defined WIN32 +# define WIN32_LEAN_AND_MEAN +# include +#endif +#if defined OS2 +# define INCL_DOS +# include +#endif + +#if ENABLE_RELOCATABLE +# include "relocatable.h" +#else +# define relocate(pathname) (pathname) +#endif + +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#endif + +#ifndef DIRECTORY_SEPARATOR +# define DIRECTORY_SEPARATOR '/' +#endif + +#ifndef ISSLASH +# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) +#endif + +#if HAVE_DECL_GETC_UNLOCKED +# undef getc +# define getc getc_unlocked +#endif + +/* The following static variable is declared 'volatile' to avoid a + possible multithread problem in the function get_charset_aliases. If we + are running in a threaded environment, and if two threads initialize + 'charset_aliases' simultaneously, both will produce the same value, + and everything will be ok if the two assignments to 'charset_aliases' + are atomic. But I don't know what will happen if the two assignments mix. */ +#if __STDC__ != 1 +# define volatile /* empty */ +#endif +/* 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 const char * volatile charset_aliases; + +/* Return a pointer to the contents of the charset.alias file. */ +static const char * +get_charset_aliases () +{ + const char *cp; + + cp = charset_aliases; + if (cp == NULL) + { +#if !(defined VMS || defined WIN32) + FILE *fp; + const char *dir = relocate (LIBDIR); + const char *base = "charset.alias"; + char *file_name; + + /* Concatenate dir and base into freshly allocated file_name. */ + { + size_t dir_len = strlen (dir); + size_t base_len = strlen (base); + int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); + file_name = (char *) malloc (dir_len + add_slash + base_len + 1); + if (file_name != NULL) + { + memcpy (file_name, dir, dir_len); + if (add_slash) + file_name[dir_len] = DIRECTORY_SEPARATOR; + memcpy (file_name + dir_len + add_slash, base, base_len + 1); + } + } + + if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) + /* Out of memory or file not found, treat it as empty. */ + cp = ""; + else + { + /* Parse the file's contents. */ + int c; + char buf1[50+1]; + char buf2[50+1]; + char *res_ptr = NULL; + size_t res_size = 0; + size_t l1, l2; + + for (;;) + { + c = getc (fp); + if (c == EOF) + break; + if (c == '\n' || c == ' ' || c == '\t') + continue; + if (c == '#') + { + /* Skip comment, to end of line. */ + do + c = getc (fp); + while (!(c == EOF || c == '\n')); + if (c == EOF) + break; + continue; + } + ungetc (c, fp); + if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) + break; + l1 = strlen (buf1); + l2 = strlen (buf2); + if (res_size == 0) + { + res_size = l1 + 1 + l2 + 1; + res_ptr = (char *) malloc (res_size + 1); + } + else + { + res_size += l1 + 1 + l2 + 1; + res_ptr = (char *) realloc (res_ptr, res_size + 1); + } + if (res_ptr == NULL) + { + /* Out of memory. */ + res_size = 0; + break; + } + strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); + strcpy (res_ptr + res_size - (l2 + 1), buf2); + } + fclose (fp); + if (res_size == 0) + cp = ""; + else + { + *(res_ptr + res_size) = '\0'; + cp = res_ptr; + } + } + + if (file_name != NULL) + free (file_name); + +#else + +# if defined VMS + /* To avoid the troubles of an extra file charset.alias_vms in the + sources of many GNU packages, simply inline the aliases here. */ + /* The list of encodings is taken from the OpenVMS 7.3-1 documentation + "Compaq C Run-Time Library Reference Manual for OpenVMS systems" + section 10.7 "Handling Different Character Sets". */ + cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" + "ISO8859-2" "\0" "ISO-8859-2" "\0" + "ISO8859-5" "\0" "ISO-8859-5" "\0" + "ISO8859-7" "\0" "ISO-8859-7" "\0" + "ISO8859-8" "\0" "ISO-8859-8" "\0" + "ISO8859-9" "\0" "ISO-8859-9" "\0" + /* Japanese */ + "eucJP" "\0" "EUC-JP" "\0" + "SJIS" "\0" "SHIFT_JIS" "\0" + "DECKANJI" "\0" "DEC-KANJI" "\0" + "SDECKANJI" "\0" "EUC-JP" "\0" + /* Chinese */ + "eucTW" "\0" "EUC-TW" "\0" + "DECHANYU" "\0" "DEC-HANYU" "\0" + "DECHANZI" "\0" "GB2312" "\0" + /* Korean */ + "DECKOREAN" "\0" "EUC-KR" "\0"; +# endif + +# if defined WIN32 + /* To avoid the troubles of installing a separate file in the same + directory as the DLL and of retrieving the DLL's directory at + runtime, simply inline the aliases here. */ + + cp = "CP936" "\0" "GBK" "\0" + "CP1361" "\0" "JOHAB" "\0" + "CP20127" "\0" "ASCII" "\0" + "CP20866" "\0" "KOI8-R" "\0" + "CP21866" "\0" "KOI8-RU" "\0" + "CP28591" "\0" "ISO-8859-1" "\0" + "CP28592" "\0" "ISO-8859-2" "\0" + "CP28593" "\0" "ISO-8859-3" "\0" + "CP28594" "\0" "ISO-8859-4" "\0" + "CP28595" "\0" "ISO-8859-5" "\0" + "CP28596" "\0" "ISO-8859-6" "\0" + "CP28597" "\0" "ISO-8859-7" "\0" + "CP28598" "\0" "ISO-8859-8" "\0" + "CP28599" "\0" "ISO-8859-9" "\0" + "CP28605" "\0" "ISO-8859-15" "\0"; +# endif +#endif + + charset_aliases = cp; + } + + return cp; +} + +/* Determine the current locale's character encoding, and canonicalize it + into one of the canonical names listed in config.charset. + The result must not be freed; it is statically allocated. + If the canonical name cannot be determined, the result is a non-canonical + name. */ + +#ifdef STATIC +STATIC +#endif +const char * +locale_charset () +{ + const char *codeset; + const char *aliases; + +#if !(defined WIN32 || defined OS2) + +# if HAVE_LANGINFO_CODESET + + /* Most systems support nl_langinfo (CODESET) nowadays. */ + codeset = nl_langinfo (CODESET); + +# else + + /* On old systems which lack it, use setlocale or getenv. */ + const char *locale = NULL; + + /* But most old systems don't have a complete set of locales. Some + (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't + use setlocale here; it would return "C" when it doesn't support the + locale name the user has set. */ +# if HAVE_SETLOCALE && 0 + locale = setlocale (LC_CTYPE, NULL); +# endif + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_ALL"); + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_CTYPE"); + if (locale == NULL || locale[0] == '\0') + locale = getenv ("LANG"); + } + } + + /* On some old systems, one used to set locale = "iso8859_1". On others, + you set it to "language_COUNTRY.charset". In any case, we resolve it + through the charset.alias file. */ + codeset = locale; + +# endif + +#elif defined WIN32 + + static char buf[2 + 10 + 1]; + + /* Woe32 has a function returning the locale's codepage as a number. */ + sprintf (buf, "CP%u", GetACP ()); + codeset = buf; + +#elif defined OS2 + + const char *locale; + static char buf[2 + 10 + 1]; + ULONG cp[3]; + ULONG cplen; + + /* Allow user to override the codeset, as set in the operating system, + with standard language environment variables. */ + locale = getenv ("LC_ALL"); + if (locale == NULL || locale[0] == '\0') + { + locale = getenv ("LC_CTYPE"); + if (locale == NULL || locale[0] == '\0') + locale = getenv ("LANG"); + } + if (locale != NULL && locale[0] != '\0') + { + /* If the locale name contains an encoding after the dot, return it. */ + const char *dot = strchr (locale, '.'); + + if (dot != NULL) + { + const char *modifier; + + dot++; + /* Look for the possible @... trailer and remove it, if any. */ + modifier = strchr (dot, '@'); + if (modifier == NULL) + return dot; + if (modifier - dot < sizeof (buf)) + { + memcpy (buf, dot, modifier - dot); + buf [modifier - dot] = '\0'; + return buf; + } + } + + /* Resolve through the charset.alias file. */ + codeset = locale; + } + else + { + /* OS/2 has a function returning the locale's codepage as a number. */ + if (DosQueryCp (sizeof (cp), cp, &cplen)) + codeset = ""; + else + { + sprintf (buf, "CP%u", cp[0]); + codeset = buf; + } + } + +#endif + + if (codeset == NULL) + /* The canonical name cannot be determined. */ + codeset = ""; + + /* Resolve alias. */ + for (aliases = get_charset_aliases (); + *aliases != '\0'; + aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) + if (strcmp (codeset, aliases) == 0 + || (aliases[0] == '*' && aliases[1] == '\0')) + { + codeset = aliases + strlen (aliases) + 1; + break; + } + + /* Don't return an empty string. GNU libc and GNU libiconv interpret + the empty string as denoting "the locale's character encoding", + thus GNU libiconv would call this function a second time. */ + if (codeset[0] == '\0') + codeset = "ASCII"; + + return codeset; +} diff --git a/intl/localcharset.h b/intl/localcharset.h new file mode 100644 index 00000000..3b137e73 --- /dev/null +++ b/intl/localcharset.h @@ -0,0 +1,42 @@ +/* Determine a canonical name for the current locale's character encoding. + Copyright (C) 2000-2003 Free Software Foundation, Inc. + This file is part of the GNU CHARSET Library. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOCALCHARSET_H +#define _LOCALCHARSET_H + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Determine the current locale's character encoding, and canonicalize it + into one of the canonical names listed in config.charset. + The result must not be freed; it is statically allocated. + If the canonical name cannot be determined, the result is a non-canonical + name. */ +extern const char * locale_charset (void); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _LOCALCHARSET_H */ diff --git a/intl/locale.alias b/intl/locale.alias new file mode 100644 index 00000000..bd6bb256 --- /dev/null +++ b/intl/locale.alias @@ -0,0 +1,78 @@ +# Locale name alias data base. +# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# 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. + +# The format of this file is the same as for the corresponding file of +# the X Window System, which normally can be found in +# /usr/lib/X11/locale/locale.alias +# A single line contains two fields: an alias and a substitution value. +# All entries are case independent. + +# Note: This file is far from being complete. If you have a value for +# your own site which you think might be useful for others too, share +# it with the rest of us. Send it using the `glibcbug' script to +# bugs@gnu.org. + +# Packages using this file: + +bokmal nb_NO.ISO-8859-1 +bokmål nb_NO.ISO-8859-1 +catalan ca_ES.ISO-8859-1 +croatian hr_HR.ISO-8859-2 +czech cs_CZ.ISO-8859-2 +danish da_DK.ISO-8859-1 +dansk da_DK.ISO-8859-1 +deutsch de_DE.ISO-8859-1 +dutch nl_NL.ISO-8859-1 +eesti et_EE.ISO-8859-1 +estonian et_EE.ISO-8859-1 +finnish fi_FI.ISO-8859-1 +français fr_FR.ISO-8859-1 +french fr_FR.ISO-8859-1 +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 he_IL.ISO-8859-8 +hrvatski hr_HR.ISO-8859-2 +hungarian hu_HU.ISO-8859-2 +icelandic is_IS.ISO-8859-1 +italian it_IT.ISO-8859-1 +japanese ja_JP.eucJP +japanese.euc ja_JP.eucJP +ja_JP ja_JP.eucJP +ja_JP.ujis ja_JP.eucJP +japanese.sjis ja_JP.SJIS +korean ko_KR.eucKR +korean.euc ko_KR.eucKR +ko_KR ko_KR.eucKR +lithuanian lt_LT.ISO-8859-13 +no_NO nb_NO.ISO-8859-1 +no_NO.ISO-8859-1 nb_NO.ISO-8859-1 +norwegian nb_NO.ISO-8859-1 +nynorsk nn_NO.ISO-8859-1 +polish pl_PL.ISO-8859-2 +portuguese pt_PT.ISO-8859-1 +romanian ro_RO.ISO-8859-2 +russian ru_RU.ISO-8859-5 +slovak sk_SK.ISO-8859-2 +slovene sl_SI.ISO-8859-2 +slovenian sl_SI.ISO-8859-2 +spanish es_ES.ISO-8859-1 +swedish sv_SE.ISO-8859-1 +thai th_TH.TIS-620 +turkish tr_TR.ISO-8859-9 diff --git a/intl/localealias.c b/intl/localealias.c new file mode 100644 index 00000000..2eaf8813 --- /dev/null +++ b/intl/localealias.c @@ -0,0 +1,414 @@ +/* Handle aliases for locale names. + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for mempcpy(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#if defined _LIBC || defined HAVE___FSETLOCKING +# include +#endif +#include + +#ifdef __GNUC__ +# undef alloca +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +#include +#include + +#include "gettextP.h" + +#if ENABLE_RELOCATABLE +# include "relocatable.h" +#else +# define relocate(pathname) (pathname) +#endif + +/* @@ end of prolog @@ */ + +#ifdef _LIBC +/* Rename the non ANSI C functions. This is required by the standard + because some ANSI C functions will require linking with this object + file and the name space must not be polluted. */ +# define strcasecmp __strcasecmp + +# ifndef mempcpy +# define mempcpy __mempcpy +# endif +# define HAVE_MEMPCPY 1 +# define HAVE___FSETLOCKING 1 + +/* We need locking here since we can be called from different places. */ +# include + +__libc_lock_define_initialized (static, lock); +#endif + +#ifndef internal_function +# define internal_function +#endif + +/* Some optimizations for glibc. */ +#ifdef _LIBC +# define FEOF(fp) feof_unlocked (fp) +# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp) +#else +# define FEOF(fp) feof (fp) +# define FGETS(buf, n, fp) fgets (buf, n, fp) +#endif + +/* For those losing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +# define freea(p) /* nothing */ +#else +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif + +#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED +# undef fgets +# define fgets(buf, len, s) fgets_unlocked (buf, len, s) +#endif +#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED +# undef feof +# define feof(s) feof_unlocked (s) +#endif + + +struct alias_map +{ + const char *alias; + const char *value; +}; + + +#ifndef _LIBC +# define libc_freeres_ptr(decl) decl +#endif + +libc_freeres_ptr (static char *string_space); +static size_t string_space_act; +static size_t string_space_max; +libc_freeres_ptr (static struct alias_map *map); +static size_t nmap; +static size_t maxmap; + + +/* Prototypes for local functions. */ +static size_t read_alias_file (const char *fname, int fname_len) + internal_function; +static int extend_alias_table (void); +static int alias_compare (const struct alias_map *map1, + const struct alias_map *map2); + + +const char * +_nl_expand_alias (const char *name) +{ + static const char *locale_alias_path; + struct alias_map *retval; + const char *result = NULL; + size_t added; + +#ifdef _LIBC + __libc_lock_lock (lock); +#endif + + if (locale_alias_path == NULL) + locale_alias_path = LOCALE_ALIAS_PATH; + + do + { + struct alias_map item; + + item.alias = name; + + if (nmap > 0) + retval = (struct alias_map *) bsearch (&item, map, nmap, + sizeof (struct alias_map), + (int (*) (const void *, + const void *) + ) alias_compare); + else + retval = NULL; + + /* We really found an alias. Return the value. */ + if (retval != NULL) + { + result = retval->value; + break; + } + + /* Perhaps we can find another alias file. */ + added = 0; + while (added == 0 && locale_alias_path[0] != '\0') + { + const char *start; + + while (locale_alias_path[0] == PATH_SEPARATOR) + ++locale_alias_path; + start = locale_alias_path; + + while (locale_alias_path[0] != '\0' + && locale_alias_path[0] != PATH_SEPARATOR) + ++locale_alias_path; + + if (start < locale_alias_path) + added = read_alias_file (start, locale_alias_path - start); + } + } + while (added != 0); + +#ifdef _LIBC + __libc_lock_unlock (lock); +#endif + + return result; +} + + +static size_t +internal_function +read_alias_file (const char *fname, int fname_len) +{ + FILE *fp; + char *full_fname; + size_t added; + static const char aliasfile[] = "/locale.alias"; + + full_fname = (char *) alloca (fname_len + sizeof aliasfile); +#ifdef HAVE_MEMPCPY + mempcpy (mempcpy (full_fname, fname, fname_len), + aliasfile, sizeof aliasfile); +#else + memcpy (full_fname, fname, fname_len); + memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); +#endif + + fp = fopen (relocate (full_fname), "r"); + freea (full_fname); + if (fp == NULL) + return 0; + +#ifdef HAVE___FSETLOCKING + /* No threads present. */ + __fsetlocking (fp, FSETLOCKING_BYCALLER); +#endif + + added = 0; + while (!FEOF (fp)) + { + /* It is a reasonable approach to use a fix buffer here because + a) we are only interested in the first two fields + b) these fields must be usable as file names and so must not + be that long + We avoid a multi-kilobyte buffer here since this would use up + stack space which we might not have if the program ran out of + memory. */ + char buf[400]; + char *alias; + char *value; + char *cp; + + if (FGETS (buf, sizeof buf, fp) == NULL) + /* EOF reached. */ + break; + + cp = buf; + /* Ignore leading white space. */ + while (isspace ((unsigned char) cp[0])) + ++cp; + + /* A leading '#' signals a comment line. */ + if (cp[0] != '\0' && cp[0] != '#') + { + alias = cp++; + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) + ++cp; + /* Terminate alias name. */ + if (cp[0] != '\0') + *cp++ = '\0'; + + /* Now look for the beginning of the value. */ + while (isspace ((unsigned char) cp[0])) + ++cp; + + if (cp[0] != '\0') + { + size_t alias_len; + size_t value_len; + + value = cp++; + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) + ++cp; + /* Terminate value. */ + if (cp[0] == '\n') + { + /* This has to be done to make the following test + for the end of line possible. We are looking for + the terminating '\n' which do not overwrite here. */ + *cp++ = '\0'; + *cp = '\n'; + } + else if (cp[0] != '\0') + *cp++ = '\0'; + + if (nmap >= maxmap) + if (__builtin_expect (extend_alias_table (), 0)) + return added; + + alias_len = strlen (alias) + 1; + value_len = strlen (value) + 1; + + if (string_space_act + alias_len + value_len > string_space_max) + { + /* Increase size of memory pool. */ + size_t new_size = (string_space_max + + (alias_len + value_len > 1024 + ? alias_len + value_len : 1024)); + char *new_pool = (char *) realloc (string_space, new_size); + if (new_pool == NULL) + return added; + + if (__builtin_expect (string_space != new_pool, 0)) + { + size_t i; + + for (i = 0; i < nmap; i++) + { + map[i].alias += new_pool - string_space; + map[i].value += new_pool - string_space; + } + } + + string_space = new_pool; + string_space_max = new_size; + } + + map[nmap].alias = memcpy (&string_space[string_space_act], + alias, alias_len); + string_space_act += alias_len; + + map[nmap].value = memcpy (&string_space[string_space_act], + value, value_len); + string_space_act += value_len; + + ++nmap; + ++added; + } + } + + /* Possibly not the whole line fits into the buffer. Ignore + the rest of the line. */ + while (strchr (buf, '\n') == NULL) + if (FGETS (buf, sizeof buf, fp) == NULL) + /* Make sure the inner loop will be left. The outer loop + will exit at the `feof' test. */ + break; + } + + /* Should we test for ferror()? I think we have to silently ignore + errors. --drepper */ + fclose (fp); + + if (added > 0) + qsort (map, nmap, sizeof (struct alias_map), + (int (*) (const void *, const void *)) alias_compare); + + return added; +} + + +static int +extend_alias_table () +{ + size_t new_size; + struct alias_map *new_map; + + new_size = maxmap == 0 ? 100 : 2 * maxmap; + new_map = (struct alias_map *) realloc (map, (new_size + * sizeof (struct alias_map))); + if (new_map == NULL) + /* Simply don't extend: we don't have any more core. */ + return -1; + + map = new_map; + maxmap = new_size; + return 0; +} + + +static int +alias_compare (const struct alias_map *map1, const struct alias_map *map2) +{ +#if defined _LIBC || defined HAVE_STRCASECMP + return strcasecmp (map1->alias, map2->alias); +#else + const unsigned char *p1 = (const unsigned char *) map1->alias; + const unsigned char *p2 = (const unsigned char *) map2->alias; + unsigned char c1, c2; + + if (p1 == p2) + return 0; + + do + { + /* I know this seems to be odd but the tolower() function in + some systems libc cannot handle nonalpha characters. */ + c1 = isupper (*p1) ? tolower (*p1) : *p1; + c2 = isupper (*p2) ? tolower (*p2) : *p2; + if (c1 == '\0') + break; + ++p1; + ++p2; + } + while (c1 == c2); + + return c1 - c2; +#endif +} diff --git a/intl/localename.c b/intl/localename.c new file mode 100644 index 00000000..5662e54f --- /dev/null +++ b/intl/localename.c @@ -0,0 +1,1142 @@ +/* Determine the current selected locale. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Ulrich Drepper , 1995. */ +/* Win32 code written by Tor Lillqvist . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#if defined _WIN32 || defined __WIN32__ +# undef WIN32 /* avoid warning on mingw32 */ +# define WIN32 +#endif + +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +/* List of language codes, sorted by value: + 0x01 LANG_ARABIC + 0x02 LANG_BULGARIAN + 0x03 LANG_CATALAN + 0x04 LANG_CHINESE + 0x05 LANG_CZECH + 0x06 LANG_DANISH + 0x07 LANG_GERMAN + 0x08 LANG_GREEK + 0x09 LANG_ENGLISH + 0x0a LANG_SPANISH + 0x0b LANG_FINNISH + 0x0c LANG_FRENCH + 0x0d LANG_HEBREW + 0x0e LANG_HUNGARIAN + 0x0f LANG_ICELANDIC + 0x10 LANG_ITALIAN + 0x11 LANG_JAPANESE + 0x12 LANG_KOREAN + 0x13 LANG_DUTCH + 0x14 LANG_NORWEGIAN + 0x15 LANG_POLISH + 0x16 LANG_PORTUGUESE + 0x17 LANG_RHAETO_ROMANCE + 0x18 LANG_ROMANIAN + 0x19 LANG_RUSSIAN + 0x1a LANG_CROATIAN == LANG_SERBIAN + 0x1b LANG_SLOVAK + 0x1c LANG_ALBANIAN + 0x1d LANG_SWEDISH + 0x1e LANG_THAI + 0x1f LANG_TURKISH + 0x20 LANG_URDU + 0x21 LANG_INDONESIAN + 0x22 LANG_UKRAINIAN + 0x23 LANG_BELARUSIAN + 0x24 LANG_SLOVENIAN + 0x25 LANG_ESTONIAN + 0x26 LANG_LATVIAN + 0x27 LANG_LITHUANIAN + 0x28 LANG_TAJIK + 0x29 LANG_FARSI + 0x2a LANG_VIETNAMESE + 0x2b LANG_ARMENIAN + 0x2c LANG_AZERI + 0x2d LANG_BASQUE + 0x2e LANG_SORBIAN + 0x2f LANG_MACEDONIAN + 0x30 LANG_SUTU + 0x31 LANG_TSONGA + 0x32 LANG_TSWANA + 0x33 LANG_VENDA + 0x34 LANG_XHOSA + 0x35 LANG_ZULU + 0x36 LANG_AFRIKAANS + 0x37 LANG_GEORGIAN + 0x38 LANG_FAEROESE + 0x39 LANG_HINDI + 0x3a LANG_MALTESE + 0x3b LANG_SAAMI + 0x3c LANG_GAELIC + 0x3d LANG_YIDDISH + 0x3e LANG_MALAY + 0x3f LANG_KAZAK + 0x40 LANG_KYRGYZ + 0x41 LANG_SWAHILI + 0x42 LANG_TURKMEN + 0x43 LANG_UZBEK + 0x44 LANG_TATAR + 0x45 LANG_BENGALI + 0x46 LANG_PUNJABI + 0x47 LANG_GUJARATI + 0x48 LANG_ORIYA + 0x49 LANG_TAMIL + 0x4a LANG_TELUGU + 0x4b LANG_KANNADA + 0x4c LANG_MALAYALAM + 0x4d LANG_ASSAMESE + 0x4e LANG_MARATHI + 0x4f LANG_SANSKRIT + 0x50 LANG_MONGOLIAN + 0x51 LANG_TIBETAN + 0x52 LANG_WELSH + 0x53 LANG_CAMBODIAN + 0x54 LANG_LAO + 0x55 LANG_BURMESE + 0x56 LANG_GALICIAN + 0x57 LANG_KONKANI + 0x58 LANG_MANIPURI + 0x59 LANG_SINDHI + 0x5a LANG_SYRIAC + 0x5b LANG_SINHALESE + 0x5c LANG_CHEROKEE + 0x5d LANG_INUKTITUT + 0x5e LANG_AMHARIC + 0x5f LANG_TAMAZIGHT + 0x60 LANG_KASHMIRI + 0x61 LANG_NEPALI + 0x62 LANG_FRISIAN + 0x63 LANG_PASHTO + 0x64 LANG_TAGALOG + 0x65 LANG_DIVEHI + 0x66 LANG_EDO + 0x67 LANG_FULFULDE + 0x68 LANG_HAUSA + 0x69 LANG_IBIBIO + 0x6a LANG_YORUBA + 0x70 LANG_IGBO + 0x71 LANG_KANURI + 0x72 LANG_OROMO + 0x73 LANG_TIGRINYA + 0x74 LANG_GUARANI + 0x75 LANG_HAWAIIAN + 0x76 LANG_LATIN + 0x77 LANG_SOMALI + 0x78 LANG_YI + 0x79 LANG_PAPIAMENTU +*/ +/* Mingw headers don't have latest language and sublanguage codes. */ +# ifndef LANG_AFRIKAANS +# define LANG_AFRIKAANS 0x36 +# endif +# ifndef LANG_ALBANIAN +# define LANG_ALBANIAN 0x1c +# endif +# ifndef LANG_AMHARIC +# define LANG_AMHARIC 0x5e +# endif +# ifndef LANG_ARABIC +# define LANG_ARABIC 0x01 +# endif +# ifndef LANG_ARMENIAN +# define LANG_ARMENIAN 0x2b +# endif +# ifndef LANG_ASSAMESE +# define LANG_ASSAMESE 0x4d +# endif +# ifndef LANG_AZERI +# define LANG_AZERI 0x2c +# endif +# ifndef LANG_BASQUE +# define LANG_BASQUE 0x2d +# endif +# ifndef LANG_BELARUSIAN +# define LANG_BELARUSIAN 0x23 +# endif +# ifndef LANG_BENGALI +# define LANG_BENGALI 0x45 +# endif +# ifndef LANG_BURMESE +# define LANG_BURMESE 0x55 +# endif +# ifndef LANG_CAMBODIAN +# define LANG_CAMBODIAN 0x53 +# endif +# ifndef LANG_CATALAN +# define LANG_CATALAN 0x03 +# endif +# ifndef LANG_CHEROKEE +# define LANG_CHEROKEE 0x5c +# endif +# ifndef LANG_DIVEHI +# define LANG_DIVEHI 0x65 +# endif +# ifndef LANG_EDO +# define LANG_EDO 0x66 +# endif +# ifndef LANG_ESTONIAN +# define LANG_ESTONIAN 0x25 +# endif +# ifndef LANG_FAEROESE +# define LANG_FAEROESE 0x38 +# endif +# ifndef LANG_FARSI +# define LANG_FARSI 0x29 +# endif +# ifndef LANG_FRISIAN +# define LANG_FRISIAN 0x62 +# endif +# ifndef LANG_FULFULDE +# define LANG_FULFULDE 0x67 +# endif +# ifndef LANG_GAELIC +# define LANG_GAELIC 0x3c +# endif +# ifndef LANG_GALICIAN +# define LANG_GALICIAN 0x56 +# endif +# ifndef LANG_GEORGIAN +# define LANG_GEORGIAN 0x37 +# endif +# ifndef LANG_GUARANI +# define LANG_GUARANI 0x74 +# endif +# ifndef LANG_GUJARATI +# define LANG_GUJARATI 0x47 +# endif +# ifndef LANG_HAUSA +# define LANG_HAUSA 0x68 +# endif +# ifndef LANG_HAWAIIAN +# define LANG_HAWAIIAN 0x75 +# endif +# ifndef LANG_HEBREW +# define LANG_HEBREW 0x0d +# endif +# ifndef LANG_HINDI +# define LANG_HINDI 0x39 +# endif +# ifndef LANG_IBIBIO +# define LANG_IBIBIO 0x69 +# endif +# ifndef LANG_IGBO +# define LANG_IGBO 0x70 +# endif +# ifndef LANG_INDONESIAN +# define LANG_INDONESIAN 0x21 +# endif +# ifndef LANG_INUKTITUT +# define LANG_INUKTITUT 0x5d +# endif +# ifndef LANG_KANNADA +# define LANG_KANNADA 0x4b +# endif +# ifndef LANG_KANURI +# define LANG_KANURI 0x71 +# endif +# ifndef LANG_KASHMIRI +# define LANG_KASHMIRI 0x60 +# endif +# ifndef LANG_KAZAK +# define LANG_KAZAK 0x3f +# endif +# ifndef LANG_KONKANI +# define LANG_KONKANI 0x57 +# endif +# ifndef LANG_KYRGYZ +# define LANG_KYRGYZ 0x40 +# endif +# ifndef LANG_LAO +# define LANG_LAO 0x54 +# endif +# ifndef LANG_LATIN +# define LANG_LATIN 0x76 +# endif +# ifndef LANG_LATVIAN +# define LANG_LATVIAN 0x26 +# endif +# ifndef LANG_LITHUANIAN +# define LANG_LITHUANIAN 0x27 +# endif +# ifndef LANG_MACEDONIAN +# define LANG_MACEDONIAN 0x2f +# endif +# ifndef LANG_MALAY +# define LANG_MALAY 0x3e +# endif +# ifndef LANG_MALAYALAM +# define LANG_MALAYALAM 0x4c +# endif +# ifndef LANG_MALTESE +# define LANG_MALTESE 0x3a +# endif +# ifndef LANG_MANIPURI +# define LANG_MANIPURI 0x58 +# endif +# ifndef LANG_MARATHI +# define LANG_MARATHI 0x4e +# endif +# ifndef LANG_MONGOLIAN +# define LANG_MONGOLIAN 0x50 +# endif +# ifndef LANG_NEPALI +# define LANG_NEPALI 0x61 +# endif +# ifndef LANG_ORIYA +# define LANG_ORIYA 0x48 +# endif +# ifndef LANG_OROMO +# define LANG_OROMO 0x72 +# endif +# ifndef LANG_PAPIAMENTU +# define LANG_PAPIAMENTU 0x79 +# endif +# ifndef LANG_PASHTO +# define LANG_PASHTO 0x63 +# endif +# ifndef LANG_PUNJABI +# define LANG_PUNJABI 0x46 +# endif +# ifndef LANG_RHAETO_ROMANCE +# define LANG_RHAETO_ROMANCE 0x17 +# endif +# ifndef LANG_SAAMI +# define LANG_SAAMI 0x3b +# endif +# ifndef LANG_SANSKRIT +# define LANG_SANSKRIT 0x4f +# endif +# ifndef LANG_SERBIAN +# define LANG_SERBIAN 0x1a +# endif +# ifndef LANG_SINDHI +# define LANG_SINDHI 0x59 +# endif +# ifndef LANG_SINHALESE +# define LANG_SINHALESE 0x5b +# endif +# ifndef LANG_SLOVAK +# define LANG_SLOVAK 0x1b +# endif +# ifndef LANG_SOMALI +# define LANG_SOMALI 0x77 +# endif +# ifndef LANG_SORBIAN +# define LANG_SORBIAN 0x2e +# endif +# ifndef LANG_SUTU +# define LANG_SUTU 0x30 +# endif +# ifndef LANG_SWAHILI +# define LANG_SWAHILI 0x41 +# endif +# ifndef LANG_SYRIAC +# define LANG_SYRIAC 0x5a +# endif +# ifndef LANG_TAGALOG +# define LANG_TAGALOG 0x64 +# endif +# ifndef LANG_TAJIK +# define LANG_TAJIK 0x28 +# endif +# ifndef LANG_TAMAZIGHT +# define LANG_TAMAZIGHT 0x5f +# endif +# ifndef LANG_TAMIL +# define LANG_TAMIL 0x49 +# endif +# ifndef LANG_TATAR +# define LANG_TATAR 0x44 +# endif +# ifndef LANG_TELUGU +# define LANG_TELUGU 0x4a +# endif +# ifndef LANG_THAI +# define LANG_THAI 0x1e +# endif +# ifndef LANG_TIBETAN +# define LANG_TIBETAN 0x51 +# endif +# ifndef LANG_TIGRINYA +# define LANG_TIGRINYA 0x73 +# endif +# ifndef LANG_TSONGA +# define LANG_TSONGA 0x31 +# endif +# ifndef LANG_TSWANA +# define LANG_TSWANA 0x32 +# endif +# ifndef LANG_TURKMEN +# define LANG_TURKMEN 0x42 +# endif +# ifndef LANG_UKRAINIAN +# define LANG_UKRAINIAN 0x22 +# endif +# ifndef LANG_URDU +# define LANG_URDU 0x20 +# endif +# ifndef LANG_UZBEK +# define LANG_UZBEK 0x43 +# endif +# ifndef LANG_VENDA +# define LANG_VENDA 0x33 +# endif +# ifndef LANG_VIETNAMESE +# define LANG_VIETNAMESE 0x2a +# endif +# ifndef LANG_WELSH +# define LANG_WELSH 0x52 +# endif +# ifndef LANG_XHOSA +# define LANG_XHOSA 0x34 +# endif +# ifndef LANG_YI +# define LANG_YI 0x78 +# endif +# ifndef LANG_YIDDISH +# define LANG_YIDDISH 0x3d +# endif +# ifndef LANG_YORUBA +# define LANG_YORUBA 0x6a +# endif +# ifndef LANG_ZULU +# define LANG_ZULU 0x35 +# endif +# ifndef SUBLANG_ARABIC_SAUDI_ARABIA +# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +# endif +# ifndef SUBLANG_ARABIC_IRAQ +# define SUBLANG_ARABIC_IRAQ 0x02 +# endif +# ifndef SUBLANG_ARABIC_EGYPT +# define SUBLANG_ARABIC_EGYPT 0x03 +# endif +# ifndef SUBLANG_ARABIC_LIBYA +# define SUBLANG_ARABIC_LIBYA 0x04 +# endif +# ifndef SUBLANG_ARABIC_ALGERIA +# define SUBLANG_ARABIC_ALGERIA 0x05 +# endif +# ifndef SUBLANG_ARABIC_MOROCCO +# define SUBLANG_ARABIC_MOROCCO 0x06 +# endif +# ifndef SUBLANG_ARABIC_TUNISIA +# define SUBLANG_ARABIC_TUNISIA 0x07 +# endif +# ifndef SUBLANG_ARABIC_OMAN +# define SUBLANG_ARABIC_OMAN 0x08 +# endif +# ifndef SUBLANG_ARABIC_YEMEN +# define SUBLANG_ARABIC_YEMEN 0x09 +# endif +# ifndef SUBLANG_ARABIC_SYRIA +# define SUBLANG_ARABIC_SYRIA 0x0a +# endif +# ifndef SUBLANG_ARABIC_JORDAN +# define SUBLANG_ARABIC_JORDAN 0x0b +# endif +# ifndef SUBLANG_ARABIC_LEBANON +# define SUBLANG_ARABIC_LEBANON 0x0c +# endif +# ifndef SUBLANG_ARABIC_KUWAIT +# define SUBLANG_ARABIC_KUWAIT 0x0d +# endif +# ifndef SUBLANG_ARABIC_UAE +# define SUBLANG_ARABIC_UAE 0x0e +# endif +# ifndef SUBLANG_ARABIC_BAHRAIN +# define SUBLANG_ARABIC_BAHRAIN 0x0f +# endif +# ifndef SUBLANG_ARABIC_QATAR +# define SUBLANG_ARABIC_QATAR 0x10 +# endif +# ifndef SUBLANG_AZERI_LATIN +# define SUBLANG_AZERI_LATIN 0x01 +# endif +# ifndef SUBLANG_AZERI_CYRILLIC +# define SUBLANG_AZERI_CYRILLIC 0x02 +# endif +# ifndef SUBLANG_BENGALI_INDIA +# define SUBLANG_BENGALI_INDIA 0x00 +# endif +# ifndef SUBLANG_BENGALI_BANGLADESH +# define SUBLANG_BENGALI_BANGLADESH 0x01 +# endif +# ifndef SUBLANG_CHINESE_MACAU +# define SUBLANG_CHINESE_MACAU 0x05 +# endif +# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA +# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +# endif +# ifndef SUBLANG_ENGLISH_JAMAICA +# define SUBLANG_ENGLISH_JAMAICA 0x08 +# endif +# ifndef SUBLANG_ENGLISH_CARIBBEAN +# define SUBLANG_ENGLISH_CARIBBEAN 0x09 +# endif +# ifndef SUBLANG_ENGLISH_BELIZE +# define SUBLANG_ENGLISH_BELIZE 0x0a +# endif +# ifndef SUBLANG_ENGLISH_TRINIDAD +# define SUBLANG_ENGLISH_TRINIDAD 0x0b +# endif +# ifndef SUBLANG_ENGLISH_ZIMBABWE +# define SUBLANG_ENGLISH_ZIMBABWE 0x0c +# endif +# ifndef SUBLANG_ENGLISH_PHILIPPINES +# define SUBLANG_ENGLISH_PHILIPPINES 0x0d +# endif +# ifndef SUBLANG_ENGLISH_INDONESIA +# define SUBLANG_ENGLISH_INDONESIA 0x0e +# endif +# ifndef SUBLANG_ENGLISH_HONGKONG +# define SUBLANG_ENGLISH_HONGKONG 0x0f +# endif +# ifndef SUBLANG_ENGLISH_INDIA +# define SUBLANG_ENGLISH_INDIA 0x10 +# endif +# ifndef SUBLANG_ENGLISH_MALAYSIA +# define SUBLANG_ENGLISH_MALAYSIA 0x11 +# endif +# ifndef SUBLANG_ENGLISH_SINGAPORE +# define SUBLANG_ENGLISH_SINGAPORE 0x12 +# endif +# ifndef SUBLANG_FRENCH_LUXEMBOURG +# define SUBLANG_FRENCH_LUXEMBOURG 0x05 +# endif +# ifndef SUBLANG_FRENCH_MONACO +# define SUBLANG_FRENCH_MONACO 0x06 +# endif +# ifndef SUBLANG_FRENCH_WESTINDIES +# define SUBLANG_FRENCH_WESTINDIES 0x07 +# endif +# ifndef SUBLANG_FRENCH_REUNION +# define SUBLANG_FRENCH_REUNION 0x08 +# endif +# ifndef SUBLANG_FRENCH_CONGO +# define SUBLANG_FRENCH_CONGO 0x09 +# endif +# ifndef SUBLANG_FRENCH_SENEGAL +# define SUBLANG_FRENCH_SENEGAL 0x0a +# endif +# ifndef SUBLANG_FRENCH_CAMEROON +# define SUBLANG_FRENCH_CAMEROON 0x0b +# endif +# ifndef SUBLANG_FRENCH_COTEDIVOIRE +# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c +# endif +# ifndef SUBLANG_FRENCH_MALI +# define SUBLANG_FRENCH_MALI 0x0d +# endif +# ifndef SUBLANG_FRENCH_MOROCCO +# define SUBLANG_FRENCH_MOROCCO 0x0e +# endif +# ifndef SUBLANG_FRENCH_HAITI +# define SUBLANG_FRENCH_HAITI 0x0f +# endif +# ifndef SUBLANG_GERMAN_LUXEMBOURG +# define SUBLANG_GERMAN_LUXEMBOURG 0x04 +# endif +# ifndef SUBLANG_GERMAN_LIECHTENSTEIN +# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +# endif +# ifndef SUBLANG_KASHMIRI_INDIA +# define SUBLANG_KASHMIRI_INDIA 0x02 +# endif +# ifndef SUBLANG_MALAY_MALAYSIA +# define SUBLANG_MALAY_MALAYSIA 0x01 +# endif +# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM +# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +# endif +# ifndef SUBLANG_NEPALI_INDIA +# define SUBLANG_NEPALI_INDIA 0x02 +# endif +# ifndef SUBLANG_PUNJABI_INDIA +# define SUBLANG_PUNJABI_INDIA 0x00 +# endif +# ifndef SUBLANG_PUNJABI_PAKISTAN +# define SUBLANG_PUNJABI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_ROMANIAN_ROMANIA +# define SUBLANG_ROMANIAN_ROMANIA 0x00 +# endif +# ifndef SUBLANG_ROMANIAN_MOLDOVA +# define SUBLANG_ROMANIAN_MOLDOVA 0x01 +# endif +# ifndef SUBLANG_SERBIAN_LATIN +# define SUBLANG_SERBIAN_LATIN 0x02 +# endif +# ifndef SUBLANG_SERBIAN_CYRILLIC +# define SUBLANG_SERBIAN_CYRILLIC 0x03 +# endif +# ifndef SUBLANG_SINDHI_INDIA +# define SUBLANG_SINDHI_INDIA 0x00 +# endif +# ifndef SUBLANG_SINDHI_PAKISTAN +# define SUBLANG_SINDHI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_SPANISH_GUATEMALA +# define SUBLANG_SPANISH_GUATEMALA 0x04 +# endif +# ifndef SUBLANG_SPANISH_COSTA_RICA +# define SUBLANG_SPANISH_COSTA_RICA 0x05 +# endif +# ifndef SUBLANG_SPANISH_PANAMA +# define SUBLANG_SPANISH_PANAMA 0x06 +# endif +# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC +# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +# endif +# ifndef SUBLANG_SPANISH_VENEZUELA +# define SUBLANG_SPANISH_VENEZUELA 0x08 +# endif +# ifndef SUBLANG_SPANISH_COLOMBIA +# define SUBLANG_SPANISH_COLOMBIA 0x09 +# endif +# ifndef SUBLANG_SPANISH_PERU +# define SUBLANG_SPANISH_PERU 0x0a +# endif +# ifndef SUBLANG_SPANISH_ARGENTINA +# define SUBLANG_SPANISH_ARGENTINA 0x0b +# endif +# ifndef SUBLANG_SPANISH_ECUADOR +# define SUBLANG_SPANISH_ECUADOR 0x0c +# endif +# ifndef SUBLANG_SPANISH_CHILE +# define SUBLANG_SPANISH_CHILE 0x0d +# endif +# ifndef SUBLANG_SPANISH_URUGUAY +# define SUBLANG_SPANISH_URUGUAY 0x0e +# endif +# ifndef SUBLANG_SPANISH_PARAGUAY +# define SUBLANG_SPANISH_PARAGUAY 0x0f +# endif +# ifndef SUBLANG_SPANISH_BOLIVIA +# define SUBLANG_SPANISH_BOLIVIA 0x10 +# endif +# ifndef SUBLANG_SPANISH_EL_SALVADOR +# define SUBLANG_SPANISH_EL_SALVADOR 0x11 +# endif +# ifndef SUBLANG_SPANISH_HONDURAS +# define SUBLANG_SPANISH_HONDURAS 0x12 +# endif +# ifndef SUBLANG_SPANISH_NICARAGUA +# define SUBLANG_SPANISH_NICARAGUA 0x13 +# endif +# ifndef SUBLANG_SPANISH_PUERTO_RICO +# define SUBLANG_SPANISH_PUERTO_RICO 0x14 +# endif +# ifndef SUBLANG_SWEDISH_FINLAND +# define SUBLANG_SWEDISH_FINLAND 0x02 +# endif +# ifndef SUBLANG_TAMAZIGHT_ARABIC +# define SUBLANG_TAMAZIGHT_ARABIC 0x01 +# endif +# ifndef SUBLANG_TAMAZIGHT_LATIN +# define SUBLANG_TAMAZIGHT_LATIN 0x02 +# endif +# ifndef SUBLANG_TIGRINYA_ETHIOPIA +# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 +# endif +# ifndef SUBLANG_TIGRINYA_ERITREA +# define SUBLANG_TIGRINYA_ERITREA 0x01 +# endif +# ifndef SUBLANG_URDU_PAKISTAN +# define SUBLANG_URDU_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_URDU_INDIA +# define SUBLANG_URDU_INDIA 0x02 +# endif +# ifndef SUBLANG_UZBEK_LATIN +# define SUBLANG_UZBEK_LATIN 0x01 +# endif +# ifndef SUBLANG_UZBEK_CYRILLIC +# define SUBLANG_UZBEK_CYRILLIC 0x02 +# endif +#endif + +/* XPG3 defines the result of 'setlocale (category, NULL)' as: + "Directs 'setlocale()' to query 'category' and return the current + setting of 'local'." + However it does not specify the exact format. Neither do SUSV2 and + ISO C 99. So we can use this feature only on selected systems (e.g. + those using GNU C Library). */ +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) +# define HAVE_LOCALE_NULL +#endif + +/* Determine the current locale's name, and canonicalize it into XPG syntax + language[_territory[.codeset]][@modifier] + The codeset part in the result is not reliable; the locale_charset() + should be used for codeset information instead. + The result must not be freed; it is statically allocated. */ + +const char * +_nl_locale_name (int category, const char *categoryname) +{ + const char *retval; + +#ifndef WIN32 + + /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. + On some systems this can be done by the 'setlocale' function itself. */ +# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL + retval = setlocale (category, NULL); +# else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval == NULL || retval[0] == '\0') + { + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval == NULL || retval[0] == '\0') + { + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval == NULL || retval[0] == '\0') + /* We use C as the default domain. POSIX says this is + implementation defined. */ + retval = "C"; + } + } +# endif + + return retval; + +#else /* WIN32 */ + + /* Return an XPG style locale name language[_territory][@modifier]. + Don't even bother determining the codeset; it's not useful in this + context, because message catalogs are not specific to a single + codeset. */ + + LCID lcid; + LANGID langid; + int primary, sub; + + /* Let the user override the system settings through environment + variables, as on POSIX systems. */ + retval = getenv ("LC_ALL"); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv (categoryname); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv ("LANG"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Use native Win32 API locale ID. */ + lcid = GetThreadLocale (); + + /* Strip off the sorting rules, keep only the language part. */ + langid = LANGIDFROMLCID (lcid); + + /* Split into language and territory part. */ + primary = PRIMARYLANGID (langid); + sub = SUBLANGID (langid); + + /* Dispatch on language. + See also http://www.unicode.org/unicode/onlinedat/languages.html . + For details about languages, see http://www.ethnologue.com/ . */ + switch (primary) + { + case LANG_AFRIKAANS: return "af_ZA"; + case LANG_ALBANIAN: return "sq_AL"; + case LANG_AMHARIC: return "am_ET"; + case LANG_ARABIC: + switch (sub) + { + case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA"; + case SUBLANG_ARABIC_IRAQ: return "ar_IQ"; + case SUBLANG_ARABIC_EGYPT: return "ar_EG"; + case SUBLANG_ARABIC_LIBYA: return "ar_LY"; + case SUBLANG_ARABIC_ALGERIA: return "ar_DZ"; + case SUBLANG_ARABIC_MOROCCO: return "ar_MA"; + case SUBLANG_ARABIC_TUNISIA: return "ar_TN"; + case SUBLANG_ARABIC_OMAN: return "ar_OM"; + case SUBLANG_ARABIC_YEMEN: return "ar_YE"; + case SUBLANG_ARABIC_SYRIA: return "ar_SY"; + case SUBLANG_ARABIC_JORDAN: return "ar_JO"; + case SUBLANG_ARABIC_LEBANON: return "ar_LB"; + case SUBLANG_ARABIC_KUWAIT: return "ar_KW"; + case SUBLANG_ARABIC_UAE: return "ar_AE"; + case SUBLANG_ARABIC_BAHRAIN: return "ar_BH"; + case SUBLANG_ARABIC_QATAR: return "ar_QA"; + } + return "ar"; + case LANG_ARMENIAN: return "hy_AM"; + case LANG_ASSAMESE: return "as_IN"; + case LANG_AZERI: + switch (sub) + { + /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */ + case SUBLANG_AZERI_LATIN: return "az_AZ@latin"; + case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic"; + } + return "az"; + case LANG_BASQUE: + return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */ + case LANG_BELARUSIAN: return "be_BY"; + case LANG_BENGALI: + switch (sub) + { + case SUBLANG_BENGALI_INDIA: return "bn_IN"; + case SUBLANG_BENGALI_BANGLADESH: return "bn_BD"; + } + return "bn"; + case LANG_BULGARIAN: return "bg_BG"; + case LANG_BURMESE: return "my_MM"; + case LANG_CAMBODIAN: return "km_KH"; + case LANG_CATALAN: return "ca_ES"; + case LANG_CHEROKEE: return "chr_US"; + case LANG_CHINESE: + switch (sub) + { + case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW"; + case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN"; + case SUBLANG_CHINESE_HONGKONG: return "zh_HK"; + case SUBLANG_CHINESE_SINGAPORE: return "zh_SG"; + case SUBLANG_CHINESE_MACAU: return "zh_MO"; + } + return "zh"; + case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN + * What used to be called Serbo-Croatian + * should really now be two separate + * languages because of political reasons. + * (Says tml, who knows nothing about Serbian + * or Croatian.) + * (I can feel those flames coming already.) + */ + switch (sub) + { + case SUBLANG_DEFAULT: return "hr_HR"; + case SUBLANG_SERBIAN_LATIN: return "sr_CS"; + case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic"; + } + return "hr"; + case LANG_CZECH: return "cs_CZ"; + case LANG_DANISH: return "da_DK"; + case LANG_DIVEHI: return "dv_MV"; + case LANG_DUTCH: + switch (sub) + { + case SUBLANG_DUTCH: return "nl_NL"; + case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE"; + } + return "nl"; + case LANG_EDO: return "bin_NG"; + case LANG_ENGLISH: + switch (sub) + { + /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought + * English was the language spoken in England. + * Oh well. + */ + case SUBLANG_ENGLISH_US: return "en_US"; + case SUBLANG_ENGLISH_UK: return "en_GB"; + case SUBLANG_ENGLISH_AUS: return "en_AU"; + case SUBLANG_ENGLISH_CAN: return "en_CA"; + case SUBLANG_ENGLISH_NZ: return "en_NZ"; + case SUBLANG_ENGLISH_EIRE: return "en_IE"; + case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA"; + case SUBLANG_ENGLISH_JAMAICA: return "en_JM"; + case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */ + case SUBLANG_ENGLISH_BELIZE: return "en_BZ"; + case SUBLANG_ENGLISH_TRINIDAD: return "en_TT"; + case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW"; + case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH"; + case SUBLANG_ENGLISH_INDONESIA: return "en_ID"; + case SUBLANG_ENGLISH_HONGKONG: return "en_HK"; + case SUBLANG_ENGLISH_INDIA: return "en_IN"; + case SUBLANG_ENGLISH_MALAYSIA: return "en_MY"; + case SUBLANG_ENGLISH_SINGAPORE: return "en_SG"; + } + return "en"; + case LANG_ESTONIAN: return "et_EE"; + case LANG_FAEROESE: return "fo_FO"; + case LANG_FARSI: return "fa_IR"; + case LANG_FINNISH: return "fi_FI"; + case LANG_FRENCH: + switch (sub) + { + case SUBLANG_FRENCH: return "fr_FR"; + case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE"; + case SUBLANG_FRENCH_CANADIAN: return "fr_CA"; + case SUBLANG_FRENCH_SWISS: return "fr_CH"; + case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU"; + case SUBLANG_FRENCH_MONACO: return "fr_MC"; + case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */ + case SUBLANG_FRENCH_REUNION: return "fr_RE"; + case SUBLANG_FRENCH_CONGO: return "fr_CG"; + case SUBLANG_FRENCH_SENEGAL: return "fr_SN"; + case SUBLANG_FRENCH_CAMEROON: return "fr_CM"; + case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI"; + case SUBLANG_FRENCH_MALI: return "fr_ML"; + case SUBLANG_FRENCH_MOROCCO: return "fr_MA"; + case SUBLANG_FRENCH_HAITI: return "fr_HT"; + } + return "fr"; + case LANG_FRISIAN: return "fy_NL"; + case LANG_FULFULDE: + /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */ + return "ff_NG"; + case LANG_GAELIC: + switch (sub) + { + case 0x01: /* SCOTTISH */ return "gd_GB"; + case 0x02: /* IRISH */ return "ga_IE"; + } + return "C"; + case LANG_GALICIAN: return "gl_ES"; + case LANG_GEORGIAN: return "ka_GE"; + case LANG_GERMAN: + switch (sub) + { + case SUBLANG_GERMAN: return "de_DE"; + case SUBLANG_GERMAN_SWISS: return "de_CH"; + case SUBLANG_GERMAN_AUSTRIAN: return "de_AT"; + case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU"; + case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI"; + } + return "de"; + case LANG_GREEK: return "el_GR"; + case LANG_GUARANI: return "gn_PY"; + case LANG_GUJARATI: return "gu_IN"; + case LANG_HAUSA: return "ha_NG"; + case LANG_HAWAIIAN: + /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers) + or Hawaii Creole English ("cpe_US", 600000 speakers)? */ + return "cpe_US"; + case LANG_HEBREW: return "he_IL"; + case LANG_HINDI: return "hi_IN"; + case LANG_HUNGARIAN: return "hu_HU"; + case LANG_IBIBIO: return "nic_NG"; + case LANG_ICELANDIC: return "is_IS"; + case LANG_IGBO: return "ig_NG"; + case LANG_INDONESIAN: return "id_ID"; + case LANG_INUKTITUT: return "iu_CA"; + case LANG_ITALIAN: + switch (sub) + { + case SUBLANG_ITALIAN: return "it_IT"; + case SUBLANG_ITALIAN_SWISS: return "it_CH"; + } + return "it"; + case LANG_JAPANESE: return "ja_JP"; + case LANG_KANNADA: return "kn_IN"; + case LANG_KANURI: return "kr_NG"; + case LANG_KASHMIRI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ks_PK"; + case SUBLANG_KASHMIRI_INDIA: return "ks_IN"; + } + return "ks"; + case LANG_KAZAK: return "kk_KZ"; + case LANG_KONKANI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "kok_IN"; + case LANG_KOREAN: return "ko_KR"; + case LANG_KYRGYZ: return "ky_KG"; + case LANG_LAO: return "lo_LA"; + case LANG_LATIN: return "la_VA"; + case LANG_LATVIAN: return "lv_LV"; + case LANG_LITHUANIAN: return "lt_LT"; + case LANG_MACEDONIAN: return "mk_MK"; + case LANG_MALAY: + switch (sub) + { + case SUBLANG_MALAY_MALAYSIA: return "ms_MY"; + case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN"; + } + return "ms"; + case LANG_MALAYALAM: return "ml_IN"; + case LANG_MALTESE: return "mt_MT"; + case LANG_MANIPURI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "mni_IN"; + case LANG_MARATHI: return "mr_IN"; + case LANG_MONGOLIAN: + return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */ + case LANG_NEPALI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ne_NP"; + case SUBLANG_NEPALI_INDIA: return "ne_IN"; + } + return "ne"; + case LANG_NORWEGIAN: + switch (sub) + { + case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO"; + case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO"; + } + return "no"; + case LANG_ORIYA: return "or_IN"; + case LANG_OROMO: return "om_ET"; + case LANG_PAPIAMENTU: return "pap_AN"; + case LANG_PASHTO: + return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */ + case LANG_POLISH: return "pl_PL"; + case LANG_PORTUGUESE: + switch (sub) + { + case SUBLANG_PORTUGUESE: return "pt_PT"; + /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT. + Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */ + case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR"; + } + return "pt"; + case LANG_PUNJABI: + switch (sub) + { + case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */ + case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */ + } + return "pa"; + case LANG_RHAETO_ROMANCE: return "rm_CH"; + case LANG_ROMANIAN: + switch (sub) + { + case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO"; + case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD"; + } + return "ro"; + case LANG_RUSSIAN: + return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */ + case LANG_SAAMI: /* actually Northern Sami */ return "se_NO"; + case LANG_SANSKRIT: return "sa_IN"; + case LANG_SINDHI: + switch (sub) + { + case SUBLANG_SINDHI_INDIA: return "sd_IN"; + case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; + } + return "sd"; + case LANG_SINHALESE: return "si_LK"; + case LANG_SLOVAK: return "sk_SK"; + case LANG_SLOVENIAN: return "sl_SI"; + case LANG_SOMALI: return "so_SO"; + case LANG_SORBIAN: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "wen_DE"; + case LANG_SPANISH: + switch (sub) + { + case SUBLANG_SPANISH: return "es_ES"; + case SUBLANG_SPANISH_MEXICAN: return "es_MX"; + case SUBLANG_SPANISH_MODERN: + return "es_ES@modern"; /* not seen on Unix */ + case SUBLANG_SPANISH_GUATEMALA: return "es_GT"; + case SUBLANG_SPANISH_COSTA_RICA: return "es_CR"; + case SUBLANG_SPANISH_PANAMA: return "es_PA"; + case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO"; + case SUBLANG_SPANISH_VENEZUELA: return "es_VE"; + case SUBLANG_SPANISH_COLOMBIA: return "es_CO"; + case SUBLANG_SPANISH_PERU: return "es_PE"; + case SUBLANG_SPANISH_ARGENTINA: return "es_AR"; + case SUBLANG_SPANISH_ECUADOR: return "es_EC"; + case SUBLANG_SPANISH_CHILE: return "es_CL"; + case SUBLANG_SPANISH_URUGUAY: return "es_UY"; + case SUBLANG_SPANISH_PARAGUAY: return "es_PY"; + case SUBLANG_SPANISH_BOLIVIA: return "es_BO"; + case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV"; + case SUBLANG_SPANISH_HONDURAS: return "es_HN"; + case SUBLANG_SPANISH_NICARAGUA: return "es_NI"; + case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR"; + } + return "es"; + case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */ + case LANG_SWAHILI: return "sw_KE"; + case LANG_SWEDISH: + switch (sub) + { + case SUBLANG_DEFAULT: return "sv_SE"; + case SUBLANG_SWEDISH_FINLAND: return "sv_FI"; + } + return "sv"; + case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */ + case LANG_TAGALOG: return "tl_PH"; + case LANG_TAJIK: return "tg_TJ"; + case LANG_TAMAZIGHT: + switch (sub) + { + /* FIXME: Adjust this when Tamazight locales appear on Unix. */ + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; + case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; + } + return "ber_MA"; + case LANG_TAMIL: + return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */ + case LANG_TATAR: return "tt_RU"; + case LANG_TELUGU: return "te_IN"; + case LANG_THAI: return "th_TH"; + case LANG_TIBETAN: return "bo_CN"; + case LANG_TIGRINYA: + switch (sub) + { + case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET"; + case SUBLANG_TIGRINYA_ERITREA: return "ti_ER"; + } + return "ti"; + case LANG_TSONGA: return "ts_ZA"; + case LANG_TSWANA: return "tn_BW"; + case LANG_TURKISH: return "tr_TR"; + case LANG_TURKMEN: return "tk_TM"; + case LANG_UKRAINIAN: return "uk_UA"; + case LANG_URDU: + switch (sub) + { + case SUBLANG_URDU_PAKISTAN: return "ur_PK"; + case SUBLANG_URDU_INDIA: return "ur_IN"; + } + return "ur"; + case LANG_UZBEK: + switch (sub) + { + case SUBLANG_UZBEK_LATIN: return "uz_UZ"; + case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic"; + } + return "uz"; + case LANG_VENDA: return "ve_ZA"; + case LANG_VIETNAMESE: return "vi_VN"; + case LANG_WELSH: return "cy_GB"; + case LANG_XHOSA: return "xh_ZA"; + case LANG_YI: return "sit_CN"; + case LANG_YIDDISH: return "yi_IL"; + case LANG_YORUBA: return "yo_NG"; + case LANG_ZULU: return "zu_ZA"; + default: return "C"; + } + +#endif +} diff --git a/intl/log.c b/intl/log.c new file mode 100644 index 00000000..cb6076e8 --- /dev/null +++ b/intl/log.c @@ -0,0 +1,98 @@ +/* Log file output. + Copyright (C) 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Bruno Haible . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include + +/* Print an ASCII string with quotes and escape sequences where needed. */ +static void +print_escaped (FILE *stream, const char *str) +{ + putc ('"', stream); + for (; *str != '\0'; str++) + if (*str == '\n') + { + fputs ("\\n\"", stream); + if (str[1] == '\0') + return; + fputs ("\n\"", stream); + } + else + { + if (*str == '"' || *str == '\\') + putc ('\\', stream); + putc (*str, stream); + } + putc ('"', stream); +} + +/* Add to the log file an entry denoting a failed translation. */ +void +_nl_log_untranslated (const char *logfilename, const char *domainname, + const char *msgid1, const char *msgid2, int plural) +{ + static char *last_logfilename = NULL; + static FILE *last_logfile = NULL; + FILE *logfile; + + /* Can we reuse the last opened logfile? */ + if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0) + { + /* Close the last used logfile. */ + if (last_logfilename != NULL) + { + if (last_logfile != NULL) + { + fclose (last_logfile); + last_logfile = NULL; + } + free (last_logfilename); + last_logfilename = NULL; + } + /* Open the logfile. */ + last_logfilename = (char *) malloc (strlen (logfilename) + 1); + if (last_logfilename == NULL) + return; + strcpy (last_logfilename, logfilename); + last_logfile = fopen (logfilename, "a"); + if (last_logfile == NULL) + return; + } + logfile = last_logfile; + + fprintf (logfile, "domain "); + print_escaped (logfile, domainname); + fprintf (logfile, "\nmsgid "); + print_escaped (logfile, msgid1); + if (plural) + { + fprintf (logfile, "\nmsgid_plural "); + print_escaped (logfile, msgid2); + fprintf (logfile, "\nmsgstr[0] \"\"\n"); + } + else + fprintf (logfile, "\nmsgstr \"\"\n"); + putc ('\n', logfile); +} diff --git a/intl/ngettext.c b/intl/ngettext.c new file mode 100644 index 00000000..e73e00c4 --- /dev/null +++ b/intl/ngettext.c @@ -0,0 +1,65 @@ +/* Implementation of ngettext(3) function. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef _LIBC +# define __need_NULL +# include +#else +# include /* Just for NULL. */ +#endif + +#include "gettextP.h" +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif + +#include + +/* @@ end of prolog @@ */ + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define NGETTEXT __ngettext +# define DCNGETTEXT __dcngettext +#else +# define NGETTEXT libintl_ngettext +# define DCNGETTEXT libintl_dcngettext +#endif + +/* Look up MSGID in the current default message catalog for the current + LC_MESSAGES locale. If not found, returns MSGID itself (the default + text). */ +char * +NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n) +{ + return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__ngettext, ngettext); +#endif diff --git a/intl/os2compat.c b/intl/os2compat.c new file mode 100644 index 00000000..c8dc33e7 --- /dev/null +++ b/intl/os2compat.c @@ -0,0 +1,98 @@ +/* OS/2 compatibility functions. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU 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. */ + +#define OS2_AWARE +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +/* A version of getenv() that works from DLLs */ +extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue); + +char * +_nl_getenv (const char *name) +{ + unsigned char *value; + if (DosScanEnv (name, &value)) + return NULL; + else + return value; +} + +/* A fixed size buffer. */ +char libintl_nl_default_dirname[MAXPATHLEN+1]; + +char *_nlos2_libdir = NULL; +char *_nlos2_localealiaspath = NULL; +char *_nlos2_localedir = NULL; + +static __attribute__((constructor)) void +nlos2_initialize () +{ + char *root = getenv ("UNIXROOT"); + char *gnulocaledir = getenv ("GNULOCALEDIR"); + + _nlos2_libdir = gnulocaledir; + if (!_nlos2_libdir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1); + memcpy (_nlos2_libdir, root, sl); + memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1); + } + else + _nlos2_libdir = LIBDIR; + } + + _nlos2_localealiaspath = gnulocaledir; + if (!_nlos2_localealiaspath) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1); + memcpy (_nlos2_localealiaspath, root, sl); + memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1); + } + else + _nlos2_localealiaspath = LOCALE_ALIAS_PATH; + } + + _nlos2_localedir = gnulocaledir; + if (!_nlos2_localedir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1); + memcpy (_nlos2_localedir, root, sl); + memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1); + } + else + _nlos2_localedir = LOCALEDIR; + } + + if (strlen (_nlos2_localedir) <= MAXPATHLEN) + strcpy (libintl_nl_default_dirname, _nlos2_localedir); +} diff --git a/intl/os2compat.h b/intl/os2compat.h new file mode 100644 index 00000000..4f74e8c0 --- /dev/null +++ b/intl/os2compat.h @@ -0,0 +1,46 @@ +/* OS/2 compatibility defines. + This file is intended to be included from config.h + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU 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. */ + +/* When included from os2compat.h we need all the original definitions */ +#ifndef OS2_AWARE + +#undef LIBDIR +#define LIBDIR _nlos2_libdir +extern char *_nlos2_libdir; + +#undef LOCALEDIR +#define LOCALEDIR _nlos2_localedir +extern char *_nlos2_localedir; + +#undef LOCALE_ALIAS_PATH +#define LOCALE_ALIAS_PATH _nlos2_localealiaspath +extern char *_nlos2_localealiaspath; + +#endif + +#undef HAVE_STRCASECMP +#define HAVE_STRCASECMP 1 +#define strcasecmp stricmp +#define strncasecmp strnicmp + +/* We have our own getenv() which works even if library is compiled as DLL */ +#define getenv _nl_getenv + +/* Older versions of gettext used -1 as the value of LC_MESSAGES */ +#define LC_MESSAGES_COMPAT (-1) diff --git a/intl/osdep.c b/intl/osdep.c new file mode 100644 index 00000000..b3725983 --- /dev/null +++ b/intl/osdep.c @@ -0,0 +1,24 @@ +/* OS dependent parts of libintl. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU 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. */ + +#if defined __EMX__ +# include "os2compat.c" +#else +/* Avoid AIX compiler warning. */ +typedef int dummy; +#endif diff --git a/intl/plural-exp.c b/intl/plural-exp.c new file mode 100644 index 00000000..8c04e642 --- /dev/null +++ b/intl/plural-exp.c @@ -0,0 +1,154 @@ +/* Expression parsing for plural form selection. + Copyright (C) 2000-2001, 2003 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 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 +#endif + +#include +#include +#include + +#include "plural-exp.h" + +#if (defined __GNUC__ && !defined __APPLE_CC__) \ + || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) + +/* These structs are the constant expression for the germanic plural + form determination. It represents the expression "n != 1". */ +static const struct expression plvar = +{ + .nargs = 0, + .operation = var, +}; +static const struct expression plone = +{ + .nargs = 0, + .operation = num, + .val = + { + .num = 1 + } +}; +struct expression GERMANIC_PLURAL = +{ + .nargs = 2, + .operation = not_equal, + .val = + { + .args = + { + [0] = (struct expression *) &plvar, + [1] = (struct expression *) &plone + } + } +}; + +# define INIT_GERMANIC_PLURAL() + +#else + +/* For compilers without support for ISO C 99 struct/union initializers: + Initialization at run-time. */ + +static struct expression plvar; +static struct expression plone; +struct expression GERMANIC_PLURAL; + +static void +init_germanic_plural () +{ + if (plone.val.num == 0) + { + plvar.nargs = 0; + plvar.operation = var; + + plone.nargs = 0; + plone.operation = num; + plone.val.num = 1; + + GERMANIC_PLURAL.nargs = 2; + GERMANIC_PLURAL.operation = not_equal; + GERMANIC_PLURAL.val.args[0] = &plvar; + GERMANIC_PLURAL.val.args[1] = &plone; + } +} + +# define INIT_GERMANIC_PLURAL() init_germanic_plural () + +#endif + +void +internal_function +EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp, + unsigned long int *npluralsp) +{ + if (nullentry != NULL) + { + const char *plural; + const char *nplurals; + + plural = strstr (nullentry, "plural="); + nplurals = strstr (nullentry, "nplurals="); + if (plural == NULL || nplurals == NULL) + goto no_plural; + else + { + char *endp; + unsigned long int n; + struct parse_args args; + + /* First get the number. */ + nplurals += 9; + while (*nplurals != '\0' && isspace ((unsigned char) *nplurals)) + ++nplurals; + if (!(*nplurals >= '0' && *nplurals <= '9')) + goto no_plural; +#if defined HAVE_STRTOUL || defined _LIBC + n = strtoul (nplurals, &endp, 10); +#else + for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) + n = n * 10 + (*endp - '0'); +#endif + if (nplurals == endp) + goto no_plural; + *npluralsp = n; + + /* Due to the restrictions bison imposes onto the interface of the + scanner function we have to put the input string and the result + passed up from the parser into the same structure which address + is passed down to the parser. */ + plural += 7; + args.cp = plural; + if (PLURAL_PARSE (&args) != 0) + goto no_plural; + *pluralp = args.res; + } + } + else + { + /* By default we are using the Germanic form: singular form only + for `one', the plural form otherwise. Yes, this is also what + English is using since English is a Germanic language. */ + no_plural: + INIT_GERMANIC_PLURAL (); + *pluralp = &GERMANIC_PLURAL; + *npluralsp = 2; + } +} diff --git a/intl/plural-exp.h b/intl/plural-exp.h new file mode 100644 index 00000000..49e2c5bf --- /dev/null +++ b/intl/plural-exp.h @@ -0,0 +1,118 @@ +/* Expression parsing and evaluation for plural form selection. + Copyright (C) 2000-2003 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 Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PLURAL_EXP_H +#define _PLURAL_EXP_H + +#ifndef internal_function +# define internal_function +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + + +/* This is the representation of the expressions to determine the + plural form. */ +struct expression +{ + int nargs; /* Number of arguments. */ + enum operator + { + /* Without arguments: */ + var, /* The variable "n". */ + num, /* Decimal number. */ + /* Unary operators: */ + lnot, /* Logical NOT. */ + /* Binary operators: */ + mult, /* Multiplication. */ + divide, /* Division. */ + module, /* Modulo operation. */ + plus, /* Addition. */ + minus, /* Subtraction. */ + less_than, /* Comparison. */ + greater_than, /* Comparison. */ + less_or_equal, /* Comparison. */ + greater_or_equal, /* Comparison. */ + equal, /* Comparison for equality. */ + not_equal, /* Comparison for inequality. */ + land, /* Logical AND. */ + lor, /* Logical OR. */ + /* Ternary operators: */ + qmop /* Question mark operator. */ + } operation; + union + { + unsigned long int num; /* Number value for `num'. */ + struct expression *args[3]; /* Up to three arguments. */ + } val; +}; + +/* This is the data structure to pass information to the parser and get + the result in a thread-safe way. */ +struct parse_args +{ + const char *cp; + struct expression *res; +}; + + +/* Names for the libintl functions are a problem. This source code is used + 1. in the GNU C Library library, + 2. in the GNU libintl library, + 3. in the GNU gettext tools. + The function names in each situation must be different, to allow for + binary incompatible changes in 'struct expression'. Furthermore, + 1. in the GNU C Library library, the names have a __ prefix, + 2.+3. in the GNU libintl library and in the GNU gettext tools, the names + must follow ANSI C and not start with __. + So we have to distinguish the three cases. */ +#ifdef _LIBC +# define FREE_EXPRESSION __gettext_free_exp +# define PLURAL_PARSE __gettextparse +# define GERMANIC_PLURAL __gettext_germanic_plural +# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural +#elif defined (IN_LIBINTL) +# define FREE_EXPRESSION libintl_gettext_free_exp +# define PLURAL_PARSE libintl_gettextparse +# define GERMANIC_PLURAL libintl_gettext_germanic_plural +# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural +#else +# define FREE_EXPRESSION free_plural_expression +# define PLURAL_PARSE parse_plural_expression +# define GERMANIC_PLURAL germanic_plural +# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression +#endif + +extern void FREE_EXPRESSION (struct expression *exp) + internal_function; +extern int PLURAL_PARSE (void *arg); +extern struct expression GERMANIC_PLURAL attribute_hidden; +extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, + struct expression **pluralp, + unsigned long int *npluralsp) + internal_function; + +#if !defined (_LIBC) && !defined (IN_LIBINTL) +extern unsigned long int plural_eval (struct expression *pexp, + unsigned long int n); +#endif + +#endif /* _PLURAL_EXP_H */ diff --git a/intl/plural.c b/intl/plural.c new file mode 100644 index 00000000..addededf --- /dev/null +++ b/intl/plural.c @@ -0,0 +1,1583 @@ +/* A Bison parser, made by GNU Bison 1.875a. */ + +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU 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, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* If NAME_PREFIX is specified substitute the variables and functions + names. */ +#define yyparse __gettextparse +#define yylex __gettextlex +#define yyerror __gettexterror +#define yylval __gettextlval +#define yychar __gettextchar +#define yydebug __gettextdebug +#define yynerrs __gettextnerrs + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + EQUOP2 = 258, + CMPOP2 = 259, + ADDOP2 = 260, + MULOP2 = 261, + NUMBER = 262 + }; +#endif +#define EQUOP2 258 +#define CMPOP2 259 +#define ADDOP2 260 +#define MULOP2 261 +#define NUMBER 262 + + + + +/* Copy the first part of user declarations. */ +#line 1 "plural.y" + +/* Expression parsing for plural form selection. + Copyright (C) 2000-2001, 2003 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 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. */ + +/* 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 + skeleton file comes too late. This must come before + because may include arbitrary system headers. */ +#if defined _AIX && !defined __GNUC__ + #pragma alloca +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include "plural-exp.h" + +/* The main function generated by the parser is called __gettextparse, + but we want it to be called PLURAL_PARSE. */ +#ifndef _LIBC +# define __gettextparse PLURAL_PARSE +#endif + +#define YYLEX_PARAM &((struct parse_args *) arg)->cp +#define YYPARSE_PARAM arg + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#line 49 "plural.y" +typedef union YYSTYPE { + unsigned long int num; + enum operator op; + struct expression *exp; +} YYSTYPE; +/* Line 191 of yacc.c. */ +#line 151 "plural.c" +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +/* Copy the second part of user declarations. */ +#line 55 "plural.y" + +/* Prototypes for local functions. */ +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); + +/* Allocation of expressions. */ + +static struct expression * +new_exp (int nargs, enum operator op, struct expression * const *args) +{ + int i; + struct expression *newp; + + /* If any of the argument could not be malloc'ed, just return NULL. */ + for (i = nargs - 1; i >= 0; i--) + if (args[i] == NULL) + goto fail; + + /* Allocate a new expression. */ + newp = (struct expression *) malloc (sizeof (*newp)); + if (newp != NULL) + { + newp->nargs = nargs; + newp->operation = op; + for (i = nargs - 1; i >= 0; i--) + newp->val.args[i] = args[i]; + return newp; + } + + fail: + for (i = nargs - 1; i >= 0; i--) + FREE_EXPRESSION (args[i]); + + return NULL; +} + +static inline struct expression * +new_exp_0 (enum operator op) +{ + return new_exp (0, op, NULL); +} + +static inline struct expression * +new_exp_1 (enum operator op, struct expression *right) +{ + struct expression *args[1]; + + args[0] = right; + return new_exp (1, op, args); +} + +static struct expression * +new_exp_2 (enum operator op, struct expression *left, struct expression *right) +{ + struct expression *args[2]; + + args[0] = left; + args[1] = right; + return new_exp (2, op, args); +} + +static inline struct expression * +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) +{ + struct expression *args[3]; + + args[0] = bexp; + args[1] = tbranch; + args[2] = fbranch; + return new_exp (3, op, args); +} + + + +/* Line 214 of yacc.c. */ +#line 237 "plural.c" + +#if ! defined (yyoverflow) || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) +# define YYSTACK_ALLOC alloca +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +# else +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +# define YYSTACK_ALLOC malloc +# define YYSTACK_FREE free +# endif +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ + + +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + short yyss; + YYSTYPE yyvs; + }; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + register YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (0) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) + +#endif + +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short yysigned_char; +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 9 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 54 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 16 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 3 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 13 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 27 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 262 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const unsigned char yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 10, 2, 2, 2, 2, 5, 2, + 14, 15, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 12, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 13, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 4, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 6, 7, + 8, 9, 11 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const unsigned char yyprhs[] = +{ + 0, 0, 3, 5, 11, 15, 19, 23, 27, 31, + 35, 38, 40, 42 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yysigned_char yyrhs[] = +{ + 17, 0, -1, 18, -1, 18, 3, 18, 12, 18, + -1, 18, 4, 18, -1, 18, 5, 18, -1, 18, + 6, 18, -1, 18, 7, 18, -1, 18, 8, 18, + -1, 18, 9, 18, -1, 10, 18, -1, 13, -1, + 11, -1, 14, 18, 15, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const unsigned char yyrline[] = +{ + 0, 150, 150, 158, 162, 166, 170, 174, 178, 182, + 186, 190, 194, 199 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", + "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", + "$accept", "start", "exp", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const unsigned short yytoknum[] = +{ + 0, 256, 257, 63, 124, 38, 258, 259, 260, 261, + 33, 262, 58, 110, 40, 41 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const unsigned char yyr1[] = +{ + 0, 16, 17, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const unsigned char yyr2[] = +{ + 0, 2, 1, 5, 3, 3, 3, 3, 3, 3, + 2, 1, 1, 3 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const unsigned char yydefact[] = +{ + 0, 0, 12, 11, 0, 0, 2, 10, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 13, 0, 4, + 5, 6, 7, 8, 9, 0, 3 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yysigned_char yydefgoto[] = +{ + -1, 5, 6 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -10 +static const yysigned_char yypact[] = +{ + -9, -9, -10, -10, -9, 8, 36, -10, 13, -10, + -9, -9, -9, -9, -9, -9, -9, -10, 26, 41, + 45, 18, -2, 14, -10, -9, 36 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yysigned_char yypgoto[] = +{ + -10, -10, -1 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const unsigned char yytable[] = +{ + 7, 1, 2, 8, 3, 4, 15, 16, 9, 18, + 19, 20, 21, 22, 23, 24, 10, 11, 12, 13, + 14, 15, 16, 16, 26, 14, 15, 16, 17, 10, + 11, 12, 13, 14, 15, 16, 0, 0, 25, 10, + 11, 12, 13, 14, 15, 16, 12, 13, 14, 15, + 16, 13, 14, 15, 16 +}; + +static const yysigned_char yycheck[] = +{ + 1, 10, 11, 4, 13, 14, 8, 9, 0, 10, + 11, 12, 13, 14, 15, 16, 3, 4, 5, 6, + 7, 8, 9, 9, 25, 7, 8, 9, 15, 3, + 4, 5, 6, 7, 8, 9, -1, -1, 12, 3, + 4, 5, 6, 7, 8, 9, 5, 6, 7, 8, + 9, 6, 7, 8, 9 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const unsigned char yystos[] = +{ + 0, 10, 11, 13, 14, 17, 18, 18, 18, 0, + 3, 4, 5, 6, 7, 8, 9, 15, 18, 18, + 18, 18, 18, 18, 18, 12, 18 +}; + +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrlab1 + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror ("syntax error: cannot back up");\ + YYERROR; \ + } \ +while (0) + +#define YYTERROR 1 +#define YYERRCODE 256 + +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ + +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + Current.first_line = Rhs[1].first_line; \ + Current.first_column = Rhs[1].first_column; \ + Current.last_line = Rhs[N].last_line; \ + Current.last_column = Rhs[N].last_column; +#endif + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval) +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) + +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (cinluded). | +`------------------------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_stack_print (short *bottom, short *top) +#else +static void +yy_stack_print (bottom, top) + short *bottom; + short *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_reduce_print (int yyrule) +#else +static void +yy_reduce_print (yyrule) + int yyrule; +#endif +{ + int yyi; + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylineno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#if YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined (__GLIBC__) && defined (_STRING_H) +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) +yystrlen (const char *yystr) +# else +yystrlen (yystr) + const char *yystr; +# endif +{ + register const char *yys = yystr; + + while (*yys++ != '\0') + continue; + + return yys - yystr - 1; +} +# endif +# endif + +# ifndef yystpcpy +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +static char * +# if defined (__STDC__) || defined (__cplusplus) +yystpcpy (char *yydest, const char *yysrc) +# else +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +# endif +{ + register char *yyd = yydest; + register const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +#endif /* !YYERROR_VERBOSE */ + + + +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + + if (yytype < YYNTOKENS) + { + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif + } + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyoutput, ")"); +} + +#endif /* ! YYDEBUG */ +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yydestruct (int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yytype, yyvaluep) + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; + + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ + +#ifdef YYPARSE_PARAM +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM); +# else +int yyparse (); +# endif +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + + + + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM) +# else +int yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +# endif +#else /* ! YYPARSE_PARAM */ +#if defined (__STDC__) || defined (__cplusplus) +int +yyparse (void) +#else +int +yyparse () + +#endif +#endif +{ + /* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; + + register int yystate; + register int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Lookahead token as an internal (translated) token number. */ + int yytoken = 0; + + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + register YYSTYPE *yyvsp; + + + +#define YYPOPSTACK (yyvsp--, yyssp--) + + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + + + /* When reducing, the number of symbols on the RHS of the reduced + rule. */ + int yylen; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + + yyssp = yyss; + yyvsp = yyvs; + + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. + */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; + + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow ("parser stack overflow", + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyoverflowlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyoverflowlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + short *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyoverflowlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + +/* Do appropriate processing given the current state. */ +/* Read a lookahead token if we need one and don't already have one. */ +/* yyresume: */ + + /* First try to decide what to do without reference to lookahead token. */ + + yyn = yypact[yystate]; + if (yyn == YYPACT_NINF) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = YYLEX; + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + if (yyn == YYFINAL) + YYACCEPT; + + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + + /* Discard the token being shifted unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + + *++yyvsp = yylval; + + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + yystate = yyn; + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 2: +#line 151 "plural.y" + { + if (yyvsp[0].exp == NULL) + YYABORT; + ((struct parse_args *) arg)->res = yyvsp[0].exp; + } + break; + + case 3: +#line 159 "plural.y" + { + yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 4: +#line 163 "plural.y" + { + yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 5: +#line 167 "plural.y" + { + yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 6: +#line 171 "plural.y" + { + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 7: +#line 175 "plural.y" + { + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 8: +#line 179 "plural.y" + { + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 9: +#line 183 "plural.y" + { + yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); + } + break; + + case 10: +#line 187 "plural.y" + { + yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); + } + break; + + case 11: +#line 191 "plural.y" + { + yyval.exp = new_exp_0 (var); + } + break; + + case 12: +#line 195 "plural.y" + { + if ((yyval.exp = new_exp_0 (num)) != NULL) + yyval.exp->val.num = yyvsp[0].num; + } + break; + + case 13: +#line 200 "plural.y" + { + yyval.exp = yyvsp[-1].exp; + } + break; + + + } + +/* Line 999 of yacc.c. */ +#line 1212 "plural.c" + + yyvsp -= yylen; + yyssp -= yylen; + + + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + + + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if YYERROR_VERBOSE + yyn = yypact[yystate]; + + if (YYPACT_NINF < yyn && yyn < YYLAST) + { + YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); + char *yymsg; + int yyx, yycount; + + yycount = 0; + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("syntax error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) + { + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) + { + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } + } + yyerror (yymsg); + YYSTACK_FREE (yymsg); + } + else + yyerror ("syntax error; also virtual memory exhausted"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror ("syntax error"); + } + + + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ + + /* Return failure if at end of input. */ + if (yychar == YYEOF) + { + /* Pop the error token. */ + YYPOPSTACK; + /* Pop the rest of the stack. */ + while (yyss < yyssp) + { + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + YYPOPSTACK; + } + YYABORT; + } + + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + + } + + /* Else will try to reuse lookahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*----------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action. | +`----------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + yyvsp--; + yystate = *--yyssp; + + YY_STACK_PRINT (yyss, yyssp); + } + + if (yyn == YYFINAL) + YYACCEPT; + + YYDPRINTF ((stderr, "Shifting error token, ")); + + *++yyvsp = yylval; + + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#ifndef yyoverflow +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif + return yyresult; +} + + +#line 205 "plural.y" + + +void +internal_function +FREE_EXPRESSION (struct expression *exp) +{ + if (exp == NULL) + return; + + /* Handle the recursive case. */ + switch (exp->nargs) + { + case 3: + FREE_EXPRESSION (exp->val.args[2]); + /* FALLTHROUGH */ + case 2: + FREE_EXPRESSION (exp->val.args[1]); + /* FALLTHROUGH */ + case 1: + FREE_EXPRESSION (exp->val.args[0]); + /* FALLTHROUGH */ + default: + break; + } + + free (exp); +} + + +static int +yylex (YYSTYPE *lval, const char **pexp) +{ + const char *exp = *pexp; + int result; + + while (1) + { + if (exp[0] == '\0') + { + *pexp = exp; + return YYEOF; + } + + if (exp[0] != ' ' && exp[0] != '\t') + break; + + ++exp; + } + + result = *exp++; + switch (result) + { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + { + unsigned long int n = result - '0'; + while (exp[0] >= '0' && exp[0] <= '9') + { + n *= 10; + n += exp[0] - '0'; + ++exp; + } + lval->num = n; + result = NUMBER; + } + break; + + case '=': + if (exp[0] == '=') + { + ++exp; + lval->op = equal; + result = EQUOP2; + } + else + result = YYERRCODE; + break; + + case '!': + if (exp[0] == '=') + { + ++exp; + lval->op = not_equal; + result = EQUOP2; + } + break; + + case '&': + case '|': + if (exp[0] == result) + ++exp; + else + result = YYERRCODE; + break; + + case '<': + if (exp[0] == '=') + { + ++exp; + lval->op = less_or_equal; + } + else + lval->op = less_than; + result = CMPOP2; + break; + + case '>': + if (exp[0] == '=') + { + ++exp; + lval->op = greater_or_equal; + } + else + lval->op = greater_than; + result = CMPOP2; + break; + + case '*': + lval->op = mult; + result = MULOP2; + break; + + case '/': + lval->op = divide; + result = MULOP2; + break; + + case '%': + lval->op = module; + result = MULOP2; + break; + + case '+': + lval->op = plus; + result = ADDOP2; + break; + + case '-': + lval->op = minus; + result = ADDOP2; + break; + + case 'n': + case '?': + case ':': + case '(': + case ')': + /* Nothing, just return the character. */ + break; + + case ';': + case '\n': + case '\0': + /* Be safe and let the user call this function again. */ + --exp; + result = YYEOF; + break; + + default: + result = YYERRCODE; +#if YYDEBUG != 0 + --exp; +#endif + break; + } + + *pexp = exp; + + return result; +} + + +static void +yyerror (const char *str) +{ + /* Do nothing. We don't print error messages here. */ +} + diff --git a/intl/plural.y b/intl/plural.y new file mode 100644 index 00000000..4d33bd7c --- /dev/null +++ b/intl/plural.y @@ -0,0 +1,381 @@ +%{ +/* Expression parsing for plural form selection. + Copyright (C) 2000-2001, 2003 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 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. */ + +/* 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 + skeleton file comes too late. This must come before + because may include arbitrary system headers. */ +#if defined _AIX && !defined __GNUC__ + #pragma alloca +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include "plural-exp.h" + +/* The main function generated by the parser is called __gettextparse, + but we want it to be called PLURAL_PARSE. */ +#ifndef _LIBC +# define __gettextparse PLURAL_PARSE +#endif + +#define YYLEX_PARAM &((struct parse_args *) arg)->cp +#define YYPARSE_PARAM arg +%} +%pure_parser +%expect 7 + +%union { + unsigned long int num; + enum operator op; + struct expression *exp; +} + +%{ +/* Prototypes for local functions. */ +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); + +/* Allocation of expressions. */ + +static struct expression * +new_exp (int nargs, enum operator op, struct expression * const *args) +{ + int i; + struct expression *newp; + + /* If any of the argument could not be malloc'ed, just return NULL. */ + for (i = nargs - 1; i >= 0; i--) + if (args[i] == NULL) + goto fail; + + /* Allocate a new expression. */ + newp = (struct expression *) malloc (sizeof (*newp)); + if (newp != NULL) + { + newp->nargs = nargs; + newp->operation = op; + for (i = nargs - 1; i >= 0; i--) + newp->val.args[i] = args[i]; + return newp; + } + + fail: + for (i = nargs - 1; i >= 0; i--) + FREE_EXPRESSION (args[i]); + + return NULL; +} + +static inline struct expression * +new_exp_0 (enum operator op) +{ + return new_exp (0, op, NULL); +} + +static inline struct expression * +new_exp_1 (enum operator op, struct expression *right) +{ + struct expression *args[1]; + + args[0] = right; + return new_exp (1, op, args); +} + +static struct expression * +new_exp_2 (enum operator op, struct expression *left, struct expression *right) +{ + struct expression *args[2]; + + args[0] = left; + args[1] = right; + return new_exp (2, op, args); +} + +static inline struct expression * +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) +{ + struct expression *args[3]; + + args[0] = bexp; + args[1] = tbranch; + args[2] = fbranch; + return new_exp (3, op, args); +} + +%} + +/* This declares that all operators have the same associativity and the + precedence order as in C. See [Harbison, Steele: C, A Reference Manual]. + There is no unary minus and no bitwise operators. + Operators with the same syntactic behaviour have been merged into a single + token, to save space in the array generated by bison. */ +%right '?' /* ? */ +%left '|' /* || */ +%left '&' /* && */ +%left EQUOP2 /* == != */ +%left CMPOP2 /* < > <= >= */ +%left ADDOP2 /* + - */ +%left MULOP2 /* * / % */ +%right '!' /* ! */ + +%token EQUOP2 CMPOP2 ADDOP2 MULOP2 +%token NUMBER +%type exp + +%% + +start: exp + { + if ($1 == NULL) + YYABORT; + ((struct parse_args *) arg)->res = $1; + } + ; + +exp: exp '?' exp ':' exp + { + $$ = new_exp_3 (qmop, $1, $3, $5); + } + | exp '|' exp + { + $$ = new_exp_2 (lor, $1, $3); + } + | exp '&' exp + { + $$ = new_exp_2 (land, $1, $3); + } + | exp EQUOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp CMPOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp ADDOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | exp MULOP2 exp + { + $$ = new_exp_2 ($2, $1, $3); + } + | '!' exp + { + $$ = new_exp_1 (lnot, $2); + } + | 'n' + { + $$ = new_exp_0 (var); + } + | NUMBER + { + if (($$ = new_exp_0 (num)) != NULL) + $$->val.num = $1; + } + | '(' exp ')' + { + $$ = $2; + } + ; + +%% + +void +internal_function +FREE_EXPRESSION (struct expression *exp) +{ + if (exp == NULL) + return; + + /* Handle the recursive case. */ + switch (exp->nargs) + { + case 3: + FREE_EXPRESSION (exp->val.args[2]); + /* FALLTHROUGH */ + case 2: + FREE_EXPRESSION (exp->val.args[1]); + /* FALLTHROUGH */ + case 1: + FREE_EXPRESSION (exp->val.args[0]); + /* FALLTHROUGH */ + default: + break; + } + + free (exp); +} + + +static int +yylex (YYSTYPE *lval, const char **pexp) +{ + const char *exp = *pexp; + int result; + + while (1) + { + if (exp[0] == '\0') + { + *pexp = exp; + return YYEOF; + } + + if (exp[0] != ' ' && exp[0] != '\t') + break; + + ++exp; + } + + result = *exp++; + switch (result) + { + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + { + unsigned long int n = result - '0'; + while (exp[0] >= '0' && exp[0] <= '9') + { + n *= 10; + n += exp[0] - '0'; + ++exp; + } + lval->num = n; + result = NUMBER; + } + break; + + case '=': + if (exp[0] == '=') + { + ++exp; + lval->op = equal; + result = EQUOP2; + } + else + result = YYERRCODE; + break; + + case '!': + if (exp[0] == '=') + { + ++exp; + lval->op = not_equal; + result = EQUOP2; + } + break; + + case '&': + case '|': + if (exp[0] == result) + ++exp; + else + result = YYERRCODE; + break; + + case '<': + if (exp[0] == '=') + { + ++exp; + lval->op = less_or_equal; + } + else + lval->op = less_than; + result = CMPOP2; + break; + + case '>': + if (exp[0] == '=') + { + ++exp; + lval->op = greater_or_equal; + } + else + lval->op = greater_than; + result = CMPOP2; + break; + + case '*': + lval->op = mult; + result = MULOP2; + break; + + case '/': + lval->op = divide; + result = MULOP2; + break; + + case '%': + lval->op = module; + result = MULOP2; + break; + + case '+': + lval->op = plus; + result = ADDOP2; + break; + + case '-': + lval->op = minus; + result = ADDOP2; + break; + + case 'n': + case '?': + case ':': + case '(': + case ')': + /* Nothing, just return the character. */ + break; + + case ';': + case '\n': + case '\0': + /* Be safe and let the user call this function again. */ + --exp; + result = YYEOF; + break; + + default: + result = YYERRCODE; +#if YYDEBUG != 0 + --exp; +#endif + break; + } + + *pexp = exp; + + return result; +} + + +static void +yyerror (const char *str) +{ + /* Do nothing. We don't print error messages here. */ +} diff --git a/intl/printf-args.c b/intl/printf-args.c new file mode 100644 index 00000000..f6f3219e --- /dev/null +++ b/intl/printf-args.c @@ -0,0 +1,119 @@ +/* Decomposed printf argument list. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "printf-args.h" + +#ifdef STATIC +STATIC +#endif +int +printf_fetchargs (va_list args, arguments *a) +{ + size_t i; + argument *ap; + + for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++) + switch (ap->type) + { + case TYPE_SCHAR: + ap->a.a_schar = va_arg (args, /*signed char*/ int); + break; + case TYPE_UCHAR: + ap->a.a_uchar = va_arg (args, /*unsigned char*/ int); + break; + case TYPE_SHORT: + ap->a.a_short = va_arg (args, /*short*/ int); + break; + case TYPE_USHORT: + ap->a.a_ushort = va_arg (args, /*unsigned short*/ int); + break; + case TYPE_INT: + ap->a.a_int = va_arg (args, int); + break; + case TYPE_UINT: + ap->a.a_uint = va_arg (args, unsigned int); + break; + case TYPE_LONGINT: + ap->a.a_longint = va_arg (args, long int); + break; + case TYPE_ULONGINT: + ap->a.a_ulongint = va_arg (args, unsigned long int); + break; +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + ap->a.a_longlongint = va_arg (args, long long int); + break; + case TYPE_ULONGLONGINT: + ap->a.a_ulonglongint = va_arg (args, unsigned long long int); + break; +#endif + case TYPE_DOUBLE: + ap->a.a_double = va_arg (args, double); + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + ap->a.a_longdouble = va_arg (args, long double); + break; +#endif + case TYPE_CHAR: + ap->a.a_char = va_arg (args, int); + break; +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: + ap->a.a_wide_char = va_arg (args, wint_t); + break; +#endif + case TYPE_STRING: + ap->a.a_string = va_arg (args, const char *); + break; +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: + ap->a.a_wide_string = va_arg (args, const wchar_t *); + break; +#endif + case TYPE_POINTER: + ap->a.a_pointer = va_arg (args, void *); + break; + case TYPE_COUNT_SCHAR_POINTER: + ap->a.a_count_schar_pointer = va_arg (args, signed char *); + break; + case TYPE_COUNT_SHORT_POINTER: + ap->a.a_count_short_pointer = va_arg (args, short *); + break; + case TYPE_COUNT_INT_POINTER: + ap->a.a_count_int_pointer = va_arg (args, int *); + break; + case TYPE_COUNT_LONGINT_POINTER: + ap->a.a_count_longint_pointer = va_arg (args, long int *); + break; +#ifdef HAVE_LONG_LONG + case TYPE_COUNT_LONGLONGINT_POINTER: + ap->a.a_count_longlongint_pointer = va_arg (args, long long int *); + break; +#endif + default: + /* Unknown type. */ + return -1; + } + return 0; +} diff --git a/intl/printf-args.h b/intl/printf-args.h new file mode 100644 index 00000000..f11e64c0 --- /dev/null +++ b/intl/printf-args.h @@ -0,0 +1,137 @@ +/* Decomposed printf argument list. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PRINTF_ARGS_H +#define _PRINTF_ARGS_H + +/* Get size_t. */ +#include + +/* Get wchar_t. */ +#ifdef HAVE_WCHAR_T +# include +#endif + +/* Get wint_t. */ +#ifdef HAVE_WINT_T +# include +#endif + +/* Get va_list. */ +#include + + +/* Argument types */ +typedef enum +{ + TYPE_NONE, + TYPE_SCHAR, + TYPE_UCHAR, + TYPE_SHORT, + TYPE_USHORT, + TYPE_INT, + TYPE_UINT, + TYPE_LONGINT, + TYPE_ULONGINT, +#ifdef HAVE_LONG_LONG + TYPE_LONGLONGINT, + TYPE_ULONGLONGINT, +#endif + TYPE_DOUBLE, +#ifdef HAVE_LONG_DOUBLE + TYPE_LONGDOUBLE, +#endif + TYPE_CHAR, +#ifdef HAVE_WINT_T + TYPE_WIDE_CHAR, +#endif + TYPE_STRING, +#ifdef HAVE_WCHAR_T + TYPE_WIDE_STRING, +#endif + TYPE_POINTER, + TYPE_COUNT_SCHAR_POINTER, + TYPE_COUNT_SHORT_POINTER, + TYPE_COUNT_INT_POINTER, + TYPE_COUNT_LONGINT_POINTER +#ifdef HAVE_LONG_LONG +, TYPE_COUNT_LONGLONGINT_POINTER +#endif +} arg_type; + +/* Polymorphic argument */ +typedef struct +{ + arg_type type; + union + { + signed char a_schar; + unsigned char a_uchar; + short a_short; + unsigned short a_ushort; + int a_int; + unsigned int a_uint; + long int a_longint; + unsigned long int a_ulongint; +#ifdef HAVE_LONG_LONG + long long int a_longlongint; + unsigned long long int a_ulonglongint; +#endif + float a_float; + double a_double; +#ifdef HAVE_LONG_DOUBLE + long double a_longdouble; +#endif + int a_char; +#ifdef HAVE_WINT_T + wint_t a_wide_char; +#endif + const char* a_string; +#ifdef HAVE_WCHAR_T + const wchar_t* a_wide_string; +#endif + void* a_pointer; + signed char * a_count_schar_pointer; + short * a_count_short_pointer; + int * a_count_int_pointer; + long int * a_count_longint_pointer; +#ifdef HAVE_LONG_LONG + long long int * a_count_longlongint_pointer; +#endif + } + a; +} +argument; + +typedef struct +{ + size_t count; + argument *arg; +} +arguments; + + +/* Fetch the arguments, putting them into a. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int printf_fetchargs (va_list args, arguments *a); + +#endif /* _PRINTF_ARGS_H */ diff --git a/intl/printf-parse.c b/intl/printf-parse.c new file mode 100644 index 00000000..d19f903d --- /dev/null +++ b/intl/printf-parse.c @@ -0,0 +1,537 @@ +/* Formatted output to strings. + Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#if WIDE_CHAR_VERSION +# include "wprintf-parse.h" +#else +# include "printf-parse.h" +#endif + +/* Get size_t, NULL. */ +#include + +/* Get intmax_t. */ +#if HAVE_STDINT_H_WITH_UINTMAX +# include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +# include +#endif + +/* malloc(), realloc(), free(). */ +#include + +/* Checked size_t computations. */ +#include "xsize.h" + +#if WIDE_CHAR_VERSION +# define PRINTF_PARSE wprintf_parse +# define CHAR_T wchar_t +# define DIRECTIVE wchar_t_directive +# define DIRECTIVES wchar_t_directives +#else +# define PRINTF_PARSE printf_parse +# define CHAR_T char +# define DIRECTIVE char_directive +# define DIRECTIVES char_directives +#endif + +#ifdef STATIC +STATIC +#endif +int +PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) +{ + const CHAR_T *cp = format; /* pointer into format */ + size_t arg_posn = 0; /* number of regular arguments consumed */ + size_t d_allocated; /* allocated elements of d->dir */ + size_t a_allocated; /* allocated elements of a->arg */ + size_t max_width_length = 0; + size_t max_precision_length = 0; + + d->count = 0; + d_allocated = 1; + d->dir = malloc (d_allocated * sizeof (DIRECTIVE)); + if (d->dir == NULL) + /* Out of memory. */ + return -1; + + a->count = 0; + a_allocated = 0; + a->arg = NULL; + +#define REGISTER_ARG(_index_,_type_) \ + { \ + size_t n = (_index_); \ + if (n >= a_allocated) \ + { \ + size_t memory_size; \ + argument *memory; \ + \ + a_allocated = xtimes (a_allocated, 2); \ + if (a_allocated <= n) \ + a_allocated = xsum (n, 1); \ + memory_size = xtimes (a_allocated, sizeof (argument)); \ + if (size_overflow_p (memory_size)) \ + /* Overflow, would lead to out of memory. */ \ + goto error; \ + memory = (a->arg \ + ? realloc (a->arg, memory_size) \ + : malloc (memory_size)); \ + if (memory == NULL) \ + /* Out of memory. */ \ + goto error; \ + a->arg = memory; \ + } \ + while (a->count <= n) \ + a->arg[a->count++].type = TYPE_NONE; \ + if (a->arg[n].type == TYPE_NONE) \ + a->arg[n].type = (_type_); \ + else if (a->arg[n].type != (_type_)) \ + /* Ambiguous type for positional argument. */ \ + goto error; \ + } + + while (*cp != '\0') + { + CHAR_T c = *cp++; + if (c == '%') + { + size_t arg_index = ARG_NONE; + DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */ + + /* Initialize the next directive. */ + dp->dir_start = cp - 1; + dp->flags = 0; + dp->width_start = NULL; + dp->width_end = NULL; + dp->width_arg_index = ARG_NONE; + dp->precision_start = NULL; + dp->precision_end = NULL; + dp->precision_arg_index = ARG_NONE; + dp->arg_index = ARG_NONE; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory later. */ + goto error; + arg_index = n - 1; + cp = np + 1; + } + } + + /* Read the flags. */ + for (;;) + { + if (*cp == '\'') + { + dp->flags |= FLAG_GROUP; + cp++; + } + else if (*cp == '-') + { + dp->flags |= FLAG_LEFT; + cp++; + } + else if (*cp == '+') + { + dp->flags |= FLAG_SHOWSIGN; + cp++; + } + else if (*cp == ' ') + { + dp->flags |= FLAG_SPACE; + cp++; + } + else if (*cp == '#') + { + dp->flags |= FLAG_ALT; + cp++; + } + else if (*cp == '0') + { + dp->flags |= FLAG_ZERO; + cp++; + } + else + break; + } + + /* Parse the field width. */ + if (*cp == '*') + { + dp->width_start = cp; + cp++; + dp->width_end = cp; + if (max_width_length < 1) + max_width_length = 1; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory later. */ + goto error; + dp->width_arg_index = n - 1; + cp = np + 1; + } + } + if (dp->width_arg_index == ARG_NONE) + { + dp->width_arg_index = arg_posn++; + if (dp->width_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->width_arg_index, TYPE_INT); + } + else if (*cp >= '0' && *cp <= '9') + { + size_t width_length; + + dp->width_start = cp; + for (; *cp >= '0' && *cp <= '9'; cp++) + ; + dp->width_end = cp; + width_length = dp->width_end - dp->width_start; + if (max_width_length < width_length) + max_width_length = width_length; + } + + /* Parse the precision. */ + if (*cp == '.') + { + cp++; + if (*cp == '*') + { + dp->precision_start = cp - 1; + cp++; + dp->precision_end = cp; + if (max_precision_length < 2) + max_precision_length = 2; + + /* Test for positional argument. */ + if (*cp >= '0' && *cp <= '9') + { + const CHAR_T *np; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + ; + if (*np == '$') + { + size_t n = 0; + + for (np = cp; *np >= '0' && *np <= '9'; np++) + n = xsum (xtimes (n, 10), *np - '0'); + if (n == 0) + /* Positional argument 0. */ + goto error; + if (size_overflow_p (n)) + /* n too large, would lead to out of memory + later. */ + goto error; + dp->precision_arg_index = n - 1; + cp = np + 1; + } + } + if (dp->precision_arg_index == ARG_NONE) + { + dp->precision_arg_index = arg_posn++; + if (dp->precision_arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->precision_arg_index, TYPE_INT); + } + else + { + size_t precision_length; + + dp->precision_start = cp - 1; + for (; *cp >= '0' && *cp <= '9'; cp++) + ; + dp->precision_end = cp; + precision_length = dp->precision_end - dp->precision_start; + if (max_precision_length < precision_length) + max_precision_length = precision_length; + } + } + + { + arg_type type; + + /* Parse argument type/size specifiers. */ + { + int flags = 0; + + for (;;) + { + if (*cp == 'h') + { + flags |= (1 << (flags & 1)); + cp++; + } + else if (*cp == 'L') + { + flags |= 4; + cp++; + } + else if (*cp == 'l') + { + flags += 8; + cp++; + } +#ifdef HAVE_INTMAX_T + else if (*cp == 'j') + { + if (sizeof (intmax_t) > sizeof (long)) + { + /* intmax_t = long long */ + flags += 16; + } + else if (sizeof (intmax_t) > sizeof (int)) + { + /* intmax_t = long */ + flags += 8; + } + cp++; + } +#endif + else if (*cp == 'z' || *cp == 'Z') + { + /* 'z' is standardized in ISO C 99, but glibc uses 'Z' + because the warning facility in gcc-2.95.2 understands + only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */ + if (sizeof (size_t) > sizeof (long)) + { + /* size_t = long long */ + flags += 16; + } + else if (sizeof (size_t) > sizeof (int)) + { + /* size_t = long */ + flags += 8; + } + cp++; + } + else if (*cp == 't') + { + if (sizeof (ptrdiff_t) > sizeof (long)) + { + /* ptrdiff_t = long long */ + flags += 16; + } + else if (sizeof (ptrdiff_t) > sizeof (int)) + { + /* ptrdiff_t = long */ + flags += 8; + } + cp++; + } + else + break; + } + + /* Read the conversion character. */ + c = *cp++; + switch (c) + { + case 'd': case 'i': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGLONGINT; + else +#endif + if (flags >= 8) + type = TYPE_LONGINT; + else if (flags & 2) + type = TYPE_SCHAR; + else if (flags & 1) + type = TYPE_SHORT; + else + type = TYPE_INT; + break; + case 'o': case 'u': case 'x': case 'X': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_ULONGLONGINT; + else +#endif + if (flags >= 8) + type = TYPE_ULONGINT; + else if (flags & 2) + type = TYPE_UCHAR; + else if (flags & 1) + type = TYPE_USHORT; + else + type = TYPE_UINT; + break; + case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': + case 'a': case 'A': +#ifdef HAVE_LONG_DOUBLE + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGDOUBLE; + else +#endif + type = TYPE_DOUBLE; + break; + case 'c': + if (flags >= 8) +#ifdef HAVE_WINT_T + type = TYPE_WIDE_CHAR; +#else + goto error; +#endif + else + type = TYPE_CHAR; + break; +#ifdef HAVE_WINT_T + case 'C': + type = TYPE_WIDE_CHAR; + c = 'c'; + break; +#endif + case 's': + if (flags >= 8) +#ifdef HAVE_WCHAR_T + type = TYPE_WIDE_STRING; +#else + goto error; +#endif + else + type = TYPE_STRING; + break; +#ifdef HAVE_WCHAR_T + case 'S': + type = TYPE_WIDE_STRING; + c = 's'; + break; +#endif + case 'p': + type = TYPE_POINTER; + break; + case 'n': +#ifdef HAVE_LONG_LONG + if (flags >= 16 || (flags & 4)) + type = TYPE_COUNT_LONGLONGINT_POINTER; + else +#endif + if (flags >= 8) + type = TYPE_COUNT_LONGINT_POINTER; + else if (flags & 2) + type = TYPE_COUNT_SCHAR_POINTER; + else if (flags & 1) + type = TYPE_COUNT_SHORT_POINTER; + else + type = TYPE_COUNT_INT_POINTER; + break; + case '%': + type = TYPE_NONE; + break; + default: + /* Unknown conversion character. */ + goto error; + } + } + + if (type != TYPE_NONE) + { + dp->arg_index = arg_index; + if (dp->arg_index == ARG_NONE) + { + dp->arg_index = arg_posn++; + if (dp->arg_index == ARG_NONE) + /* arg_posn wrapped around. */ + goto error; + } + REGISTER_ARG (dp->arg_index, type); + } + dp->conversion = c; + dp->dir_end = cp; + } + + d->count++; + if (d->count >= d_allocated) + { + size_t memory_size; + DIRECTIVE *memory; + + d_allocated = xtimes (d_allocated, 2); + memory_size = xtimes (d_allocated, sizeof (DIRECTIVE)); + if (size_overflow_p (memory_size)) + /* Overflow, would lead to out of memory. */ + goto error; + memory = realloc (d->dir, memory_size); + if (memory == NULL) + /* Out of memory. */ + goto error; + d->dir = memory; + } + } + } + d->dir[d->count].dir_start = cp; + + d->max_width_length = max_width_length; + d->max_precision_length = max_precision_length; + return 0; + +error: + if (a->arg) + free (a->arg); + if (d->dir) + free (d->dir); + return -1; +} + +#undef DIRECTIVES +#undef DIRECTIVE +#undef CHAR_T +#undef PRINTF_PARSE diff --git a/intl/printf-parse.h b/intl/printf-parse.h new file mode 100644 index 00000000..8aec50e2 --- /dev/null +++ b/intl/printf-parse.h @@ -0,0 +1,75 @@ +/* Parse printf format string. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _PRINTF_PARSE_H +#define _PRINTF_PARSE_H + +#include "printf-args.h" + + +/* Flags */ +#define FLAG_GROUP 1 /* ' flag */ +#define FLAG_LEFT 2 /* - flag */ +#define FLAG_SHOWSIGN 4 /* + flag */ +#define FLAG_SPACE 8 /* space flag */ +#define FLAG_ALT 16 /* # flag */ +#define FLAG_ZERO 32 + +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + +/* A parsed directive. */ +typedef struct +{ + const char* dir_start; + const char* dir_end; + int flags; + const char* width_start; + const char* width_end; + size_t width_arg_index; + const char* precision_start; + const char* precision_end; + size_t precision_arg_index; + char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ + size_t arg_index; +} +char_directive; + +/* A parsed format string. */ +typedef struct +{ + size_t count; + char_directive *dir; + size_t max_width_length; + size_t max_precision_length; +} +char_directives; + + +/* Parses the format string. Fills in the number N of directives, and fills + in directives[0], ..., directives[N-1], and sets directives[N].dir_start + to the end of the format string. Also fills in the arg_type fields of the + arguments and the needed count of arguments. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int printf_parse (const char *format, char_directives *d, arguments *a); + +#endif /* _PRINTF_PARSE_H */ diff --git a/intl/printf.c b/intl/printf.c new file mode 100644 index 00000000..878646c2 --- /dev/null +++ b/intl/printf.c @@ -0,0 +1,371 @@ +/* Formatted output to strings, using POSIX/XSI format strings with positions. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +#include + +#if !HAVE_POSIX_PRINTF + +#include +#include + +/* When building a DLL, we must export some functions. Note that because + the functions are only defined for binary backward compatibility, we + don't need to use __declspec(dllimport) in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define DLL_EXPORTED __declspec(dllexport) +#else +# define DLL_EXPORTED +#endif + +#define STATIC static + +/* Define auxiliary functions declared in "printf-args.h". */ +#include "printf-args.c" + +/* Define auxiliary functions declared in "printf-parse.h". */ +#include "printf-parse.c" + +/* Define functions declared in "vasnprintf.h". */ +#define vasnprintf libintl_vasnprintf +#include "vasnprintf.c" +#if 0 /* not needed */ +#define asnprintf libintl_asnprintf +#include "asnprintf.c" +#endif + +DLL_EXPORTED +int +libintl_vfprintf (FILE *stream, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vfprintf (stream, format, args); + else + { + size_t length; + char *result = libintl_vasnprintf (NULL, &length, format, args); + int retval = -1; + if (result != NULL) + { + if (fwrite (result, 1, length, stream) == length) + retval = length; + free (result); + } + return retval; + } +} + +DLL_EXPORTED +int +libintl_fprintf (FILE *stream, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vfprintf (stream, format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vprintf (const char *format, va_list args) +{ + return libintl_vfprintf (stdout, format, args); +} + +DLL_EXPORTED +int +libintl_printf (const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vprintf (format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vsprintf (char *resultbuf, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vsprintf (resultbuf, format, args); + else + { + size_t length = (size_t) ~0 / (4 * sizeof (char)); + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_sprintf (char *resultbuf, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vsprintf (resultbuf, format, args); + va_end (args); + return retval; +} + +#if HAVE_SNPRINTF + +# if HAVE_DECL__SNPRINTF + /* Windows. */ +# define system_vsnprintf _vsnprintf +# else + /* Unix. */ +# define system_vsnprintf vsnprintf +# endif + +DLL_EXPORTED +int +libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return system_vsnprintf (resultbuf, length, format, args); + else + { + size_t maxlength = length; + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + if (maxlength > 0) + { + if (length < maxlength) + abort (); + memcpy (resultbuf, result, maxlength - 1); + resultbuf[maxlength - 1] = '\0'; + } + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_snprintf (char *resultbuf, size_t length, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vsnprintf (resultbuf, length, format, args); + va_end (args); + return retval; +} + +#endif + +#if HAVE_ASPRINTF + +DLL_EXPORTED +int +libintl_vasprintf (char **resultp, const char *format, va_list args) +{ + size_t length; + char *result = libintl_vasnprintf (NULL, &length, format, args); + if (result == NULL) + return -1; + *resultp = result; + return length; +} + +DLL_EXPORTED +int +libintl_asprintf (char **resultp, const char *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vasprintf (resultp, format, args); + va_end (args); + return retval; +} + +#endif + +#if HAVE_FWPRINTF + +#include + +#define WIDE_CHAR_VERSION 1 + +/* Define auxiliary functions declared in "wprintf-parse.h". */ +#include "printf-parse.c" + +/* Define functions declared in "vasnprintf.h". */ +#define vasnwprintf libintl_vasnwprintf +#include "vasnprintf.c" +#if 0 /* not needed */ +#define asnwprintf libintl_asnwprintf +#include "asnprintf.c" +#endif + +# if HAVE_DECL__SNWPRINTF + /* Windows. */ +# define system_vswprintf _vsnwprintf +# else + /* Unix. */ +# define system_vswprintf vswprintf +# endif + +DLL_EXPORTED +int +libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args) +{ + if (wcschr (format, '$') == NULL) + return vfwprintf (stream, format, args); + else + { + size_t length; + wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args); + int retval = -1; + if (result != NULL) + { + size_t i; + for (i = 0; i < length; i++) + if (fputwc (result[i], stream) == WEOF) + break; + if (i == length) + retval = length; + free (result); + } + return retval; + } +} + +DLL_EXPORTED +int +libintl_fwprintf (FILE *stream, const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vfwprintf (stream, format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vwprintf (const wchar_t *format, va_list args) +{ + return libintl_vfwprintf (stdout, format, args); +} + +DLL_EXPORTED +int +libintl_wprintf (const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vwprintf (format, args); + va_end (args); + return retval; +} + +DLL_EXPORTED +int +libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args) +{ + if (wcschr (format, '$') == NULL) + return system_vswprintf (resultbuf, length, format, args); + else + { + size_t maxlength = length; + wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + if (maxlength > 0) + { + if (length < maxlength) + abort (); + memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t)); + resultbuf[maxlength - 1] = 0; + } + free (result); + return -1; + } + else + return length; + } +} + +DLL_EXPORTED +int +libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...) +{ + va_list args; + int retval; + + va_start (args, format); + retval = libintl_vswprintf (resultbuf, length, format, args); + va_end (args); + return retval; +} + +#endif + +#endif diff --git a/intl/ref-add.sin b/intl/ref-add.sin new file mode 100644 index 00000000..167374e3 --- /dev/null +++ b/intl/ref-add.sin @@ -0,0 +1,31 @@ +# Add this package to a list of references stored in a text file. +# +# Copyright (C) 2000 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# +# Written by Bruno Haible . +# +/^# Packages using this file: / { + s/# Packages using this file:// + ta + :a + s/ @PACKAGE@ / @PACKAGE@ / + tb + s/ $/ @PACKAGE@ / + :b + s/^/# Packages using this file:/ +} diff --git a/intl/ref-del.sin b/intl/ref-del.sin new file mode 100644 index 00000000..613cf37f --- /dev/null +++ b/intl/ref-del.sin @@ -0,0 +1,26 @@ +# Remove this package from a list of references stored in a text file. +# +# Copyright (C) 2000 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# +# Written by Bruno Haible . +# +/^# Packages using this file: / { + s/# Packages using this file:// + s/ @PACKAGE@ / / + s/^/# Packages using this file:/ +} diff --git a/intl/relocatable.c b/intl/relocatable.c new file mode 100644 index 00000000..bf7c7085 --- /dev/null +++ b/intl/relocatable.c @@ -0,0 +1,449 @@ +/* Provide relocatable packages. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + + +/* Tell glibc's to provide a prototype for getline(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +/* Specification. */ +#include "relocatable.h" + +#if ENABLE_RELOCATABLE + +#include +#include +#include +#include + +#ifdef NO_XMALLOC +# define xmalloc malloc +#else +# include "xalloc.h" +#endif + +#if defined _WIN32 || defined __WIN32__ +# define WIN32_LEAN_AND_MEAN +# include +#endif + +#if DEPENDS_ON_LIBCHARSET +# include +#endif +#if DEPENDS_ON_LIBICONV && HAVE_ICONV +# include +#endif +#if DEPENDS_ON_LIBINTL && ENABLE_NLS +# include +#endif + +/* Faked cheap 'bool'. */ +#undef bool +#undef false +#undef true +#define bool int +#define false 0 +#define true 1 + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +# define FILESYSTEM_PREFIX_LEN(P) 0 +#endif + +/* Original installation prefix. */ +static char *orig_prefix; +static size_t orig_prefix_len; +/* Current installation prefix. */ +static char *curr_prefix; +static size_t curr_prefix_len; +/* These prefixes do not end in a slash. Anything that will be concatenated + to them must start with a slash. */ + +/* Sets the original and the current installation prefix of this module. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +static void +set_this_relocation_prefix (const char *orig_prefix_arg, + const char *curr_prefix_arg) +{ + if (orig_prefix_arg != NULL && curr_prefix_arg != NULL + /* Optimization: if orig_prefix and curr_prefix are equal, the + relocation is a nop. */ + && strcmp (orig_prefix_arg, curr_prefix_arg) != 0) + { + /* Duplicate the argument strings. */ + char *memory; + + orig_prefix_len = strlen (orig_prefix_arg); + curr_prefix_len = strlen (curr_prefix_arg); + memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1); +#ifdef NO_XMALLOC + if (memory != NULL) +#endif + { + memcpy (memory, orig_prefix_arg, orig_prefix_len + 1); + orig_prefix = memory; + memory += orig_prefix_len + 1; + memcpy (memory, curr_prefix_arg, curr_prefix_len + 1); + curr_prefix = memory; + return; + } + } + orig_prefix = NULL; + curr_prefix = NULL; + /* Don't worry about wasted memory here - this function is usually only + called once. */ +} + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +void +set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) +{ + set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg); + + /* Now notify all dependent libraries. */ +#if DEPENDS_ON_LIBCHARSET + libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 + libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix + libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); +#endif +} + +#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) + +/* Convenience function: + Computes the current installation prefix, based on the original + installation prefix, the original installation directory of a particular + file, and the current pathname of this file. Returns NULL upon failure. */ +#ifdef IN_LIBRARY +#define compute_curr_prefix local_compute_curr_prefix +static +#endif +const char * +compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname) +{ + const char *curr_installdir; + const char *rel_installdir; + + if (curr_pathname == NULL) + return NULL; + + /* Determine the relative installation directory, relative to the prefix. + This is simply the difference between orig_installprefix and + orig_installdir. */ + if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix)) + != 0) + /* Shouldn't happen - nothing should be installed outside $(prefix). */ + return NULL; + rel_installdir = orig_installdir + strlen (orig_installprefix); + + /* Determine the current installation directory. */ + { + const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname); + const char *p = curr_pathname + strlen (curr_pathname); + char *q; + + while (p > p_base) + { + p--; + if (ISSLASH (*p)) + break; + } + + q = (char *) xmalloc (p - curr_pathname + 1); +#ifdef NO_XMALLOC + if (q == NULL) + return NULL; +#endif + memcpy (q, curr_pathname, p - curr_pathname); + q[p - curr_pathname] = '\0'; + curr_installdir = q; + } + + /* Compute the current installation prefix by removing the trailing + rel_installdir from it. */ + { + const char *rp = rel_installdir + strlen (rel_installdir); + const char *cp = curr_installdir + strlen (curr_installdir); + const char *cp_base = + curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir); + + while (rp > rel_installdir && cp > cp_base) + { + bool same = false; + const char *rpi = rp; + const char *cpi = cp; + + while (rpi > rel_installdir && cpi > cp_base) + { + rpi--; + cpi--; + if (ISSLASH (*rpi) || ISSLASH (*cpi)) + { + if (ISSLASH (*rpi) && ISSLASH (*cpi)) + same = true; + break; + } +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS - case insignificant filesystem */ + if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi) + != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi)) + break; +#else + if (*rpi != *cpi) + break; +#endif + } + if (!same) + break; + /* The last pathname component was the same. opi and cpi now point + to the slash before it. */ + rp = rpi; + cp = cpi; + } + + if (rp > rel_installdir) + /* Unexpected: The curr_installdir does not end with rel_installdir. */ + return NULL; + + { + size_t curr_prefix_len = cp - curr_installdir; + char *curr_prefix; + + curr_prefix = (char *) xmalloc (curr_prefix_len + 1); +#ifdef NO_XMALLOC + if (curr_prefix == NULL) + return NULL; +#endif + memcpy (curr_prefix, curr_installdir, curr_prefix_len); + curr_prefix[curr_prefix_len] = '\0'; + + return curr_prefix; + } + } +} + +#endif /* !IN_LIBRARY || PIC */ + +#if defined PIC && defined INSTALLDIR + +/* Full pathname of shared library, or NULL. */ +static char *shared_library_fullname; + +#if defined _WIN32 || defined __WIN32__ + +/* Determine the full pathname of the shared library when it is loaded. */ + +BOOL WINAPI +DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) +{ + (void) reserved; + + if (event == DLL_PROCESS_ATTACH) + { + /* The DLL is being loaded into an application's address range. */ + static char location[MAX_PATH]; + + if (!GetModuleFileName (module_handle, location, sizeof (location))) + /* Shouldn't happen. */ + return FALSE; + + if (!IS_PATH_WITH_DIR (location)) + /* Shouldn't happen. */ + return FALSE; + + shared_library_fullname = strdup (location); + } + + return TRUE; +} + +#else /* Unix */ + +static void +find_shared_library_fullname () +{ +#if defined __linux__ && __GLIBC__ >= 2 + /* Linux has /proc/self/maps. glibc 2 has the getline() function. */ + FILE *fp; + + /* Open the current process' maps file. It describes one VMA per line. */ + fp = fopen ("/proc/self/maps", "r"); + if (fp) + { + unsigned long address = (unsigned long) &find_shared_library_fullname; + for (;;) + { + unsigned long start, end; + int c; + + if (fscanf (fp, "%lx-%lx", &start, &end) != 2) + break; + if (address >= start && address <= end - 1) + { + /* Found it. Now see if this line contains a filename. */ + while (c = getc (fp), c != EOF && c != '\n' && c != '/') + continue; + if (c == '/') + { + size_t size; + int len; + + ungetc (c, fp); + shared_library_fullname = NULL; size = 0; + len = getline (&shared_library_fullname, &size, fp); + if (len >= 0) + { + /* Success: filled shared_library_fullname. */ + if (len > 0 && shared_library_fullname[len - 1] == '\n') + shared_library_fullname[len - 1] = '\0'; + } + } + break; + } + while (c = getc (fp), c != EOF && c != '\n') + continue; + } + fclose (fp); + } +#endif +} + +#endif /* WIN32 / Unix */ + +/* Return the full pathname of the current shared library. + Return NULL if unknown. + Guaranteed to work only on Linux and Woe32. */ +static char * +get_shared_library_fullname () +{ +#if !(defined _WIN32 || defined __WIN32__) + static bool tried_find_shared_library_fullname; + if (!tried_find_shared_library_fullname) + { + find_shared_library_fullname (); + tried_find_shared_library_fullname = true; + } +#endif + return shared_library_fullname; +} + +#endif /* PIC */ + +/* Returns the pathname, relocated according to the current installation + directory. */ +const char * +relocate (const char *pathname) +{ +#if defined PIC && defined INSTALLDIR + static int initialized; + + /* Initialization code for a shared library. */ + if (!initialized) + { + /* At this point, orig_prefix and curr_prefix likely have already been + set through the main program's set_program_name_and_installdir + function. This is sufficient in the case that the library has + initially been installed in the same orig_prefix. But we can do + better, to also cover the cases that 1. it has been installed + in a different prefix before being moved to orig_prefix and (later) + to curr_prefix, 2. unlike the program, it has not moved away from + orig_prefix. */ + const char *orig_installprefix = INSTALLPREFIX; + const char *orig_installdir = INSTALLDIR; + const char *curr_prefix_better; + + curr_prefix_better = + compute_curr_prefix (orig_installprefix, orig_installdir, + get_shared_library_fullname ()); + if (curr_prefix_better == NULL) + curr_prefix_better = curr_prefix; + + set_relocation_prefix (orig_installprefix, curr_prefix_better); + + initialized = 1; + } +#endif + + /* Note: It is not necessary to perform case insensitive comparison here, + even for DOS-like filesystems, because the pathname argument was + typically created from the same Makefile variable as orig_prefix came + from. */ + if (orig_prefix != NULL && curr_prefix != NULL + && strncmp (pathname, orig_prefix, orig_prefix_len) == 0) + { + if (pathname[orig_prefix_len] == '\0') + /* pathname equals orig_prefix. */ + return curr_prefix; + if (ISSLASH (pathname[orig_prefix_len])) + { + /* pathname starts with orig_prefix. */ + const char *pathname_tail = &pathname[orig_prefix_len]; + char *result = + (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1); + +#ifdef NO_XMALLOC + if (result != NULL) +#endif + { + memcpy (result, curr_prefix, curr_prefix_len); + strcpy (result + curr_prefix_len, pathname_tail); + return result; + } + } + } + /* Nothing to relocate. */ + return pathname; +} + +#endif diff --git a/intl/relocatable.h b/intl/relocatable.h new file mode 100644 index 00000000..48c5b71e --- /dev/null +++ b/intl/relocatable.h @@ -0,0 +1,77 @@ +/* Provide relocatable packages. + Copyright (C) 2003 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _RELOCATABLE_H +#define _RELOCATABLE_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/* This can be enabled through the configure --enable-relocatable option. */ +#if ENABLE_RELOCATABLE + +/* When building a DLL, we must export some functions. Note that because + this is a private .h file, we don't need to use __declspec(dllimport) + in any case. */ +#if defined _MSC_VER && BUILDING_DLL +# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport) +#else +# define RELOCATABLE_DLL_EXPORTED +#endif + +/* Sets the original and the current installation prefix of the package. + Relocation simply replaces a pathname starting with the original prefix + by the corresponding pathname with the current prefix instead. Both + prefixes should be directory names without trailing slash (i.e. use "" + instead of "/"). */ +extern RELOCATABLE_DLL_EXPORTED void + set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); + +/* Returns the pathname, relocated according to the current installation + directory. */ +extern const char * relocate (const char *pathname); + +/* Memory management: relocate() leaks memory, because it has to construct + a fresh pathname. If this is a problem because your program calls + relocate() frequently, think about caching the result. */ + +/* Convenience function: + Computes the current installation prefix, based on the original + installation prefix, the original installation directory of a particular + file, and the current pathname of this file. Returns NULL upon failure. */ +extern const char * compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname); + +#else + +/* By default, we use the hardwired pathnames. */ +#define relocate(pathname) (pathname) + +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _RELOCATABLE_H */ diff --git a/intl/textdomain.c b/intl/textdomain.c new file mode 100644 index 00000000..8745a843 --- /dev/null +++ b/intl/textdomain.c @@ -0,0 +1,141 @@ +/* Implementation of the textdomain(3) function. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + 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 +#endif + +#include +#include + +#ifdef _LIBC +# include +#else +# include "libgnuintl.h" +#endif +#include "gettextP.h" + +#ifdef _LIBC +/* We have to handle multi-threaded applications. */ +# include +#else +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain libintl_nl_default_default_domain +# define _nl_current_default_domain libintl_nl_current_default_domain +#endif + +/* @@ end of prolog @@ */ + +/* Name of the default text domain. */ +extern const char _nl_default_default_domain[] attribute_hidden; + +/* Default text domain in which entries for gettext(3) are to be found. */ +extern const char *_nl_current_default_domain attribute_hidden; + + +/* Names for the libintl functions are a problem. They must not clash + with existing names and they should follow ANSI C. But this source + code is also used in GNU C Library where the names have a __ + prefix. So we have to make a difference here. */ +#ifdef _LIBC +# define TEXTDOMAIN __textdomain +# ifndef strdup +# define strdup(str) __strdup (str) +# endif +#else +# define TEXTDOMAIN libintl_textdomain +#endif + +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock attribute_hidden) + +/* 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". */ +char * +TEXTDOMAIN (const char *domainname) +{ + char *new_domain; + char *old_domain; + + /* A NULL pointer requests the current setting. */ + if (domainname == NULL) + return (char *) _nl_current_default_domain; + + __libc_rwlock_wrlock (_nl_state_lock); + + old_domain = (char *) _nl_current_default_domain; + + /* If domain name is the null string set to default domain "messages". */ + if (domainname[0] == '\0' + || strcmp (domainname, _nl_default_default_domain) == 0) + { + _nl_current_default_domain = _nl_default_default_domain; + new_domain = (char *) _nl_current_default_domain; + } + else if (strcmp (domainname, old_domain) == 0) + /* This can happen and people will use it to signal that some + environment variable changed. */ + new_domain = old_domain; + else + { + /* If the following malloc fails `_nl_current_default_domain' + will be NULL. This value will be returned and so signals we + are out of core. */ +#if defined _LIBC || defined HAVE_STRDUP + new_domain = strdup (domainname); +#else + size_t len = strlen (domainname) + 1; + new_domain = (char *) malloc (len); + if (new_domain != NULL) + memcpy (new_domain, domainname, len); +#endif + + if (new_domain != NULL) + _nl_current_default_domain = new_domain; + } + + /* We use this possibility to signal a change of the loaded catalogs + since this is most likely the case and there is no other easy we + to do it. Do it only when the call was successful. */ + if (new_domain != NULL) + { + ++_nl_msg_cat_cntr; + + if (old_domain != new_domain && old_domain != _nl_default_default_domain) + free (old_domain); + } + + __libc_rwlock_unlock (_nl_state_lock); + + return new_domain; +} + +#ifdef _LIBC +/* Alias for function name in GNU C Library. */ +weak_alias (__textdomain, textdomain); +#endif diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c new file mode 100644 index 00000000..8a62282d --- /dev/null +++ b/intl/vasnprintf.c @@ -0,0 +1,887 @@ +/* vsprintf with automatic memory allocation. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's to provide a prototype for snprintf(). + This must come before because may include + , and once has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#ifdef HAVE_CONFIG_H +# include +#endif +#ifndef IN_LIBINTL +# include +#endif + +/* Specification. */ +#if WIDE_CHAR_VERSION +# include "vasnwprintf.h" +#else +# include "vasnprintf.h" +#endif + +#include /* snprintf(), sprintf() */ +#include /* abort(), malloc(), realloc(), free() */ +#include /* memcpy(), strlen() */ +#include /* errno */ +#include /* CHAR_BIT */ +#include /* DBL_MAX_EXP, LDBL_MAX_EXP */ +#if WIDE_CHAR_VERSION +# include "wprintf-parse.h" +#else +# include "printf-parse.h" +#endif + +/* Checked size_t computations. */ +#include "xsize.h" + +#ifdef HAVE_WCHAR_T +# ifdef HAVE_WCSLEN +# define local_wcslen wcslen +# else + /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid + a dependency towards this library, here is a local substitute. + Define this substitute only once, even if this file is included + twice in the same compilation unit. */ +# ifndef local_wcslen_defined +# define local_wcslen_defined 1 +static size_t +local_wcslen (const wchar_t *s) +{ + const wchar_t *ptr; + + for (ptr = s; *ptr != (wchar_t) 0; ptr++) + ; + return ptr - s; +} +# endif +# endif +#endif + +#if WIDE_CHAR_VERSION +# define VASNPRINTF vasnwprintf +# define CHAR_T wchar_t +# define DIRECTIVE wchar_t_directive +# define DIRECTIVES wchar_t_directives +# define PRINTF_PARSE wprintf_parse +# define USE_SNPRINTF 1 +# if HAVE_DECL__SNWPRINTF + /* On Windows, the function swprintf() has a different signature than + on Unix; we use the _snwprintf() function instead. */ +# define SNPRINTF _snwprintf +# else + /* Unix. */ +# define SNPRINTF swprintf +# endif +#else +# define VASNPRINTF vasnprintf +# define CHAR_T char +# define DIRECTIVE char_directive +# define DIRECTIVES char_directives +# define PRINTF_PARSE printf_parse +# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) +# if HAVE_DECL__SNPRINTF + /* Windows. */ +# define SNPRINTF _snprintf +# else + /* Unix. */ +# define SNPRINTF snprintf +# endif +#endif + +CHAR_T * +VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args) +{ + DIRECTIVES d; + arguments a; + + if (PRINTF_PARSE (format, &d, &a) < 0) + { + errno = EINVAL; + return NULL; + } + +#define CLEANUP() \ + free (d.dir); \ + if (a.arg) \ + free (a.arg); + + if (printf_fetchargs (args, &a) < 0) + { + CLEANUP (); + errno = EINVAL; + return NULL; + } + + { + size_t buf_neededlength; + CHAR_T *buf; + CHAR_T *buf_malloced; + const CHAR_T *cp; + size_t i; + DIRECTIVE *dp; + /* Output string accumulator. */ + CHAR_T *result; + size_t allocated; + size_t length; + + /* Allocate a small buffer that will hold a directive passed to + sprintf or snprintf. */ + buf_neededlength = + xsum4 (7, d.max_width_length, d.max_precision_length, 6); +#if HAVE_ALLOCA + if (buf_neededlength < 4000 / sizeof (CHAR_T)) + { + buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T)); + buf_malloced = NULL; + } + else +#endif + { + size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T)); + if (size_overflow_p (buf_memsize)) + goto out_of_memory_1; + buf = (CHAR_T *) malloc (buf_memsize); + if (buf == NULL) + goto out_of_memory_1; + buf_malloced = buf; + } + + if (resultbuf != NULL) + { + result = resultbuf; + allocated = *lengthp; + } + else + { + result = NULL; + allocated = 0; + } + length = 0; + /* Invariants: + result is either == resultbuf or == NULL or malloc-allocated. + If length > 0, then result != NULL. */ + + /* Ensures that allocated >= needed. Aborts through a jump to + out_of_memory if needed is SIZE_MAX or otherwise too big. */ +#define ENSURE_ALLOCATION(needed) \ + if ((needed) > allocated) \ + { \ + size_t memory_size; \ + CHAR_T *memory; \ + \ + allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \ + if ((needed) > allocated) \ + allocated = (needed); \ + memory_size = xtimes (allocated, sizeof (CHAR_T)); \ + if (size_overflow_p (memory_size)) \ + goto out_of_memory; \ + if (result == resultbuf || result == NULL) \ + memory = (CHAR_T *) malloc (memory_size); \ + else \ + memory = (CHAR_T *) realloc (result, memory_size); \ + if (memory == NULL) \ + goto out_of_memory; \ + if (result == resultbuf && length > 0) \ + memcpy (memory, result, length * sizeof (CHAR_T)); \ + result = memory; \ + } + + for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) + { + if (cp != dp->dir_start) + { + size_t n = dp->dir_start - cp; + size_t augmented_length = xsum (length, n); + + ENSURE_ALLOCATION (augmented_length); + memcpy (result + length, cp, n * sizeof (CHAR_T)); + length = augmented_length; + } + if (i == d.count) + break; + + /* Execute a single directive. */ + if (dp->conversion == '%') + { + size_t augmented_length; + + if (!(dp->arg_index == ARG_NONE)) + abort (); + augmented_length = xsum (length, 1); + ENSURE_ALLOCATION (augmented_length); + result[length] = '%'; + length = augmented_length; + } + else + { + if (!(dp->arg_index != ARG_NONE)) + abort (); + + if (dp->conversion == 'n') + { + switch (a.arg[dp->arg_index].type) + { + case TYPE_COUNT_SCHAR_POINTER: + *a.arg[dp->arg_index].a.a_count_schar_pointer = length; + break; + case TYPE_COUNT_SHORT_POINTER: + *a.arg[dp->arg_index].a.a_count_short_pointer = length; + break; + case TYPE_COUNT_INT_POINTER: + *a.arg[dp->arg_index].a.a_count_int_pointer = length; + break; + case TYPE_COUNT_LONGINT_POINTER: + *a.arg[dp->arg_index].a.a_count_longint_pointer = length; + break; +#ifdef HAVE_LONG_LONG + case TYPE_COUNT_LONGLONGINT_POINTER: + *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length; + break; +#endif + default: + abort (); + } + } + else + { + arg_type type = a.arg[dp->arg_index].type; + CHAR_T *p; + unsigned int prefix_count; + int prefixes[2]; +#if !USE_SNPRINTF + size_t tmp_length; + CHAR_T tmpbuf[700]; + CHAR_T *tmp; + + /* Allocate a temporary buffer of sufficient size for calling + sprintf. */ + { + size_t width; + size_t precision; + + width = 0; + if (dp->width_start != dp->width_end) + { + if (dp->width_arg_index != ARG_NONE) + { + int arg; + + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; + width = (arg < 0 ? (unsigned int) (-arg) : arg); + } + else + { + const CHAR_T *digitp = dp->width_start; + + do + width = xsum (xtimes (width, 10), *digitp++ - '0'); + while (digitp != dp->width_end); + } + } + + precision = 6; + if (dp->precision_start != dp->precision_end) + { + if (dp->precision_arg_index != ARG_NONE) + { + int arg; + + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->precision_arg_index].a.a_int; + precision = (arg < 0 ? 0 : arg); + } + else + { + const CHAR_T *digitp = dp->precision_start + 1; + + precision = 0; + do + precision = xsum (xtimes (precision, 10), *digitp++ - '0'); + while (digitp != dp->precision_end); + } + } + + switch (dp->conversion) + { + + case 'd': case 'i': case 'u': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + break; + + case 'o': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1 /* turn floor into ceil */ + + 1; /* account for leading sign */ + break; + + case 'x': case 'X': +# ifdef HAVE_LONG_LONG + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + else +# endif + if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading sign or alternate form */ + break; + + case 'f': case 'F': +# ifdef HAVE_LONG_DOUBLE + if (type == TYPE_LONGDOUBLE) + tmp_length = + (unsigned int) (LDBL_MAX_EXP + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 10; /* sign, decimal point etc. */ + else +# endif + tmp_length = + (unsigned int) (DBL_MAX_EXP + * 0.30103 /* binary -> decimal */ + * 2 /* estimate for FLAG_GROUP */ + ) + + 1 /* turn floor into ceil */ + + 10; /* sign, decimal point etc. */ + tmp_length = xsum (tmp_length, precision); + break; + + case 'e': case 'E': case 'g': case 'G': + case 'a': case 'A': + tmp_length = + 12; /* sign, decimal point, exponent etc. */ + tmp_length = xsum (tmp_length, precision); + break; + + case 'c': +# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION + if (type == TYPE_WIDE_CHAR) + tmp_length = MB_CUR_MAX; + else +# endif + tmp_length = 1; + break; + + case 's': +# ifdef HAVE_WCHAR_T + if (type == TYPE_WIDE_STRING) + { + tmp_length = + local_wcslen (a.arg[dp->arg_index].a.a_wide_string); + +# if !WIDE_CHAR_VERSION + tmp_length = xtimes (tmp_length, MB_CUR_MAX); +# endif + } + else +# endif + tmp_length = strlen (a.arg[dp->arg_index].a.a_string); + break; + + case 'p': + tmp_length = + (unsigned int) (sizeof (void *) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1 /* turn floor into ceil */ + + 2; /* account for leading 0x */ + break; + + default: + abort (); + } + + if (tmp_length < width) + tmp_length = width; + + tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */ + } + + if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T)) + tmp = tmpbuf; + else + { + size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T)); + + if (size_overflow_p (tmp_memsize)) + /* Overflow, would lead to out of memory. */ + goto out_of_memory; + tmp = (CHAR_T *) malloc (tmp_memsize); + if (tmp == NULL) + /* Out of memory. */ + goto out_of_memory; + } +#endif + + /* Construct the format string for calling snprintf or + sprintf. */ + p = buf; + *p++ = '%'; + if (dp->flags & FLAG_GROUP) + *p++ = '\''; + if (dp->flags & FLAG_LEFT) + *p++ = '-'; + if (dp->flags & FLAG_SHOWSIGN) + *p++ = '+'; + if (dp->flags & FLAG_SPACE) + *p++ = ' '; + if (dp->flags & FLAG_ALT) + *p++ = '#'; + if (dp->flags & FLAG_ZERO) + *p++ = '0'; + if (dp->width_start != dp->width_end) + { + size_t n = dp->width_end - dp->width_start; + memcpy (p, dp->width_start, n * sizeof (CHAR_T)); + p += n; + } + if (dp->precision_start != dp->precision_end) + { + size_t n = dp->precision_end - dp->precision_start; + memcpy (p, dp->precision_start, n * sizeof (CHAR_T)); + p += n; + } + + switch (type) + { +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + case TYPE_ULONGLONGINT: + *p++ = 'l'; + /*FALLTHROUGH*/ +#endif + case TYPE_LONGINT: + case TYPE_ULONGINT: +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: +#endif +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: +#endif + *p++ = 'l'; + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + *p++ = 'L'; + break; +#endif + default: + break; + } + *p = dp->conversion; +#if USE_SNPRINTF + p[1] = '%'; + p[2] = 'n'; + p[3] = '\0'; +#else + p[1] = '\0'; +#endif + + /* Construct the arguments for calling snprintf or sprintf. */ + prefix_count = 0; + if (dp->width_arg_index != ARG_NONE) + { + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; + } + if (dp->precision_arg_index != ARG_NONE) + { + if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) + abort (); + prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int; + } + +#if USE_SNPRINTF + /* Prepare checking whether snprintf returns the count + via %n. */ + ENSURE_ALLOCATION (xsum (length, 1)); + result[length] = '\0'; +#endif + + for (;;) + { + size_t maxlen; + int count; + int retcount; + + maxlen = allocated - length; + count = -1; + retcount = 0; + +#if USE_SNPRINTF +# define SNPRINTF_BUF(arg) \ + switch (prefix_count) \ + { \ + case 0: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + arg, &count); \ + break; \ + case 1: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + prefixes[0], arg, &count); \ + break; \ + case 2: \ + retcount = SNPRINTF (result + length, maxlen, buf, \ + prefixes[0], prefixes[1], arg, \ + &count); \ + break; \ + default: \ + abort (); \ + } +#else +# define SNPRINTF_BUF(arg) \ + switch (prefix_count) \ + { \ + case 0: \ + count = sprintf (tmp, buf, arg); \ + break; \ + case 1: \ + count = sprintf (tmp, buf, prefixes[0], arg); \ + break; \ + case 2: \ + count = sprintf (tmp, buf, prefixes[0], prefixes[1],\ + arg); \ + break; \ + default: \ + abort (); \ + } +#endif + + switch (type) + { + case TYPE_SCHAR: + { + int arg = a.arg[dp->arg_index].a.a_schar; + SNPRINTF_BUF (arg); + } + break; + case TYPE_UCHAR: + { + unsigned int arg = a.arg[dp->arg_index].a.a_uchar; + SNPRINTF_BUF (arg); + } + break; + case TYPE_SHORT: + { + int arg = a.arg[dp->arg_index].a.a_short; + SNPRINTF_BUF (arg); + } + break; + case TYPE_USHORT: + { + unsigned int arg = a.arg[dp->arg_index].a.a_ushort; + SNPRINTF_BUF (arg); + } + break; + case TYPE_INT: + { + int arg = a.arg[dp->arg_index].a.a_int; + SNPRINTF_BUF (arg); + } + break; + case TYPE_UINT: + { + unsigned int arg = a.arg[dp->arg_index].a.a_uint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_LONGINT: + { + long int arg = a.arg[dp->arg_index].a.a_longint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_ULONGINT: + { + unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_LONG_LONG + case TYPE_LONGLONGINT: + { + long long int arg = a.arg[dp->arg_index].a.a_longlongint; + SNPRINTF_BUF (arg); + } + break; + case TYPE_ULONGLONGINT: + { + unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_DOUBLE: + { + double arg = a.arg[dp->arg_index].a.a_double; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_LONG_DOUBLE + case TYPE_LONGDOUBLE: + { + long double arg = a.arg[dp->arg_index].a.a_longdouble; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_CHAR: + { + int arg = a.arg[dp->arg_index].a.a_char; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_WINT_T + case TYPE_WIDE_CHAR: + { + wint_t arg = a.arg[dp->arg_index].a.a_wide_char; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_STRING: + { + const char *arg = a.arg[dp->arg_index].a.a_string; + SNPRINTF_BUF (arg); + } + break; +#ifdef HAVE_WCHAR_T + case TYPE_WIDE_STRING: + { + const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string; + SNPRINTF_BUF (arg); + } + break; +#endif + case TYPE_POINTER: + { + void *arg = a.arg[dp->arg_index].a.a_pointer; + SNPRINTF_BUF (arg); + } + break; + default: + abort (); + } + +#if USE_SNPRINTF + /* Portability: Not all implementations of snprintf() + are ISO C 99 compliant. Determine the number of + bytes that snprintf() has produced or would have + produced. */ + if (count >= 0) + { + /* Verify that snprintf() has NUL-terminated its + result. */ + if (count < maxlen && result[length + count] != '\0') + abort (); + /* Portability hack. */ + if (retcount > count) + count = retcount; + } + else + { + /* snprintf() doesn't understand the '%n' + directive. */ + if (p[1] != '\0') + { + /* Don't use the '%n' directive; instead, look + at the snprintf() return value. */ + p[1] = '\0'; + continue; + } + else + { + /* Look at the snprintf() return value. */ + if (retcount < 0) + { + /* HP-UX 10.20 snprintf() is doubly deficient: + It doesn't understand the '%n' directive, + *and* it returns -1 (rather than the length + that would have been required) when the + buffer is too small. */ + size_t bigger_need = + xsum (xtimes (allocated, 2), 12); + ENSURE_ALLOCATION (bigger_need); + continue; + } + else + count = retcount; + } + } +#endif + + /* Attempt to handle failure. */ + if (count < 0) + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EINVAL; + return NULL; + } + +#if !USE_SNPRINTF + if (count >= tmp_length) + /* tmp_length was incorrectly calculated - fix the + code above! */ + abort (); +#endif + + /* Make room for the result. */ + if (count >= maxlen) + { + /* Need at least count bytes. But allocate + proportionally, to avoid looping eternally if + snprintf() reports a too small count. */ + size_t n = + xmax (xsum (length, count), xtimes (allocated, 2)); + + ENSURE_ALLOCATION (n); +#if USE_SNPRINTF + continue; +#endif + } + +#if USE_SNPRINTF + /* The snprintf() result did fit. */ +#else + /* Append the sprintf() result. */ + memcpy (result + length, tmp, count * sizeof (CHAR_T)); + if (tmp != tmpbuf) + free (tmp); +#endif + + length += count; + break; + } + } + } + } + + /* Add the final NUL. */ + ENSURE_ALLOCATION (xsum (length, 1)); + result[length] = '\0'; + + if (result != resultbuf && length + 1 < allocated) + { + /* Shrink the allocated memory if possible. */ + CHAR_T *memory; + + memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T)); + if (memory != NULL) + result = memory; + } + + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + *lengthp = length; + return result; + + out_of_memory: + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + out_of_memory_1: + CLEANUP (); + errno = ENOMEM; + return NULL; + } +} + +#undef SNPRINTF +#undef USE_SNPRINTF +#undef PRINTF_PARSE +#undef DIRECTIVES +#undef DIRECTIVE +#undef CHAR_T +#undef VASNPRINTF diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h new file mode 100644 index 00000000..65f1bc13 --- /dev/null +++ b/intl/vasnprintf.h @@ -0,0 +1,61 @@ +/* vsprintf with automatic memory allocation. + Copyright (C) 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _VASNPRINTF_H +#define _VASNPRINTF_H + +/* Get va_list. */ +#include + +/* Get size_t. */ +#include + +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# define __attribute__(Spec) /* empty */ +# endif +/* The __-protected variants of `format' and `printf' attributes + are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) +# define __format__ format +# define __printf__ printf +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Write formatted output to a string dynamically allocated with malloc(). + You can pass a preallocated buffer for the result in RESULTBUF and its + size in *LENGTHP; otherwise you pass RESULTBUF = NULL. + If successful, return the address of the string (this may be = RESULTBUF + if no dynamic memory allocation was necessary) and set *LENGTHP to the + number of resulting bytes, excluding the trailing NUL. Upon error, set + errno and return NULL. */ +extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); +extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 3, 0))); + +#ifdef __cplusplus +} +#endif + +#endif /* _VASNPRINTF_H */ diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h new file mode 100644 index 00000000..d3cef4cb --- /dev/null +++ b/intl/vasnwprintf.h @@ -0,0 +1,46 @@ +/* vswprintf with automatic memory allocation. + Copyright (C) 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _VASNWPRINTF_H +#define _VASNWPRINTF_H + +/* Get va_list. */ +#include + +/* Get wchar_t, size_t. */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* Write formatted output to a string dynamically allocated with malloc(). + You can pass a preallocated buffer for the result in RESULTBUF and its + size in *LENGTHP; otherwise you pass RESULTBUF = NULL. + If successful, return the address of the string (this may be = RESULTBUF + if no dynamic memory allocation was necessary) and set *LENGTHP to the + number of resulting bytes, excluding the trailing NUL. Upon error, set + errno and return NULL. */ +extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...); +extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args); + +#ifdef __cplusplus +} +#endif + +#endif /* _VASNWPRINTF_H */ diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h new file mode 100644 index 00000000..24a2cfc2 --- /dev/null +++ b/intl/wprintf-parse.h @@ -0,0 +1,75 @@ +/* Parse printf format string. + Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _WPRINTF_PARSE_H +#define _WPRINTF_PARSE_H + +#include "printf-args.h" + + +/* Flags */ +#define FLAG_GROUP 1 /* ' flag */ +#define FLAG_LEFT 2 /* - flag */ +#define FLAG_SHOWSIGN 4 /* + flag */ +#define FLAG_SPACE 8 /* space flag */ +#define FLAG_ALT 16 /* # flag */ +#define FLAG_ZERO 32 + +/* arg_index value indicating that no argument is consumed. */ +#define ARG_NONE (~(size_t)0) + +/* A parsed directive. */ +typedef struct +{ + const wchar_t* dir_start; + const wchar_t* dir_end; + int flags; + const wchar_t* width_start; + const wchar_t* width_end; + size_t width_arg_index; + const wchar_t* precision_start; + const wchar_t* precision_end; + size_t precision_arg_index; + wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */ + size_t arg_index; +} +wchar_t_directive; + +/* A parsed format string. */ +typedef struct +{ + size_t count; + wchar_t_directive *dir; + size_t max_width_length; + size_t max_precision_length; +} +wchar_t_directives; + + +/* Parses the format string. Fills in the number N of directives, and fills + in directives[0], ..., directives[N-1], and sets directives[N].dir_start + to the end of the format string. Also fills in the arg_type fields of the + arguments and the needed count of arguments. */ +#ifdef STATIC +STATIC +#else +extern +#endif +int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a); + +#endif /* _WPRINTF_PARSE_H */ diff --git a/intl/xsize.h b/intl/xsize.h new file mode 100644 index 00000000..362e24b7 --- /dev/null +++ b/intl/xsize.h @@ -0,0 +1,109 @@ +/* xsize.h -- Checked size_t computations. + + Copyright (C) 2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _XSIZE_H +#define _XSIZE_H + +/* Get size_t. */ +#include + +/* Get SIZE_MAX. */ +#include +#if HAVE_STDINT_H +# include +#endif + +/* The size of memory objects is often computed through expressions of + type size_t. Example: + void* p = malloc (header_size + n * element_size). + These computations can lead to overflow. When this happens, malloc() + returns a piece of memory that is way too small, and the program then + crashes while attempting to fill the memory. + To avoid this, the functions and macros in this file check for overflow. + The convention is that SIZE_MAX represents overflow. + malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc + implementation that uses mmap --, it's recommended to use size_overflow_p() + or size_in_bounds_p() before invoking malloc(). + The example thus becomes: + size_t size = xsum (header_size, xtimes (n, element_size)); + void *p = (size_in_bounds_p (size) ? malloc (size) : NULL); +*/ + +/* Convert an arbitrary value >= 0 to type size_t. */ +#define xcast_size_t(N) \ + ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX) + +/* Sum of two sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum (size_t size1, size_t size2) +{ + size_t sum = size1 + size2; + return (sum >= size1 ? sum : SIZE_MAX); +} + +/* Sum of three sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum3 (size_t size1, size_t size2, size_t size3) +{ + return xsum (xsum (size1, size2), size3); +} + +/* Sum of four sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xsum4 (size_t size1, size_t size2, size_t size3, size_t size4) +{ + return xsum (xsum (xsum (size1, size2), size3), size4); +} + +/* Maximum of two sizes, with overflow check. */ +static inline size_t +#if __GNUC__ >= 3 +__attribute__ ((__pure__)) +#endif +xmax (size_t size1, size_t size2) +{ + /* No explicit check is needed here, because for any n: + max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */ + return (size1 >= size2 ? size1 : size2); +} + +/* Multiplication of a count with an element size, with overflow check. + The count must be >= 0 and the element size must be > 0. + This is a macro, not an inline function, so that it works correctly even + when N is of a wider tupe and N > SIZE_MAX. */ +#define xtimes(N, ELSIZE) \ + ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX) + +/* Check for overflow. */ +#define size_overflow_p(SIZE) \ + ((SIZE) == SIZE_MAX) +/* Check against overflow. */ +#define size_in_bounds_p(SIZE) \ + ((SIZE) != SIZE_MAX) + +#endif /* _XSIZE_H */ diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index fca2d0e1..00000000 --- a/lib/Makefile +++ /dev/null @@ -1,37 +0,0 @@ - - -srcdir = . -top_srcdir = .. - -default: all -include ../Makefile.conf - -SOURCES = compat.c compression.c database.c dbmodify.c dump.c \ - ehandle.c fields.c lock.c mlib.c myopt.c nfmalloc.c \ - parse.c parsehelp.c showcright.c showpkg.c tarfn.c \ - varbuf.c vercmp.c md5.c utils.c - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) libdpkg.a - -ALL_CFLAGS += -DCOPYINGFILE=\"$(copyingfile)\" - -.PHONY: all -all:: libdpkg.a - -libdpkg.a: $(OBJECTS) - $(AR) r $@ $^ - $(RANLIB) $@ - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 00000000..44d088ec --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,39 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +pkgconfdir = $(sysconfdir)/@PACKAGE@ +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DCONFIGDIR=\"$(pkgconfdir)\" \ + -DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \ + $(ZLIB_CFLAGS) $(BZ2_CFLAGS) + + +noinst_LIBRARIES = libdpkg.a + +libdpkg_a_SOURCES = \ + dpkg.h \ + dpkg-db.h \ + compat.c \ + compression.c \ + database.c \ + dbmodify.c \ + dump.c \ + ehandle.c \ + fields.c \ + gettext.h \ + lock.c \ + md5.c md5.h \ + mlib.c \ + myopt.c myopt.h \ + nfmalloc.c \ + parse.c \ + parsehelp.c \ + parsedump.h \ + showcright.c \ + showpkg.c \ + star.c \ + tarfn.c tarfn.h \ + utils.c \ + varbuf.c \ + vercmp.c diff --git a/lib/Makefile.in b/lib/Makefile.in index fb5dd1a7..67e62407 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,37 +1,520 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -default: all -include ../Makefile.conf +# 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. -SOURCES = compat.c compression.c database.c dbmodify.c dump.c \ - ehandle.c fields.c lock.c mlib.c myopt.c nfmalloc.c \ - parse.c parsehelp.c showcright.c showpkg.c tarfn.c \ - varbuf.c vercmp.c md5.c utils.c +@SET_MAKE@ -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) libdpkg.a +SOURCES = $(libdpkg_a_SOURCES) -ALL_CFLAGS += -DCOPYINGFILE=\"$(copyingfile)\" +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = lib +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +libdpkg_a_AR = $(AR) $(ARFLAGS) +libdpkg_a_LIBADD = +am_libdpkg_a_OBJECTS = compat.$(OBJEXT) compression.$(OBJEXT) \ + database.$(OBJEXT) dbmodify.$(OBJEXT) dump.$(OBJEXT) \ + ehandle.$(OBJEXT) fields.$(OBJEXT) lock.$(OBJEXT) \ + md5.$(OBJEXT) mlib.$(OBJEXT) myopt.$(OBJEXT) \ + nfmalloc.$(OBJEXT) parse.$(OBJEXT) parsehelp.$(OBJEXT) \ + showcright.$(OBJEXT) showpkg.$(OBJEXT) star.$(OBJEXT) \ + tarfn.$(OBJEXT) utils.$(OBJEXT) varbuf.$(OBJEXT) \ + vercmp.$(OBJEXT) +libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/compat.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/compression.Po ./$(DEPDIR)/database.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/dbmodify.Po ./$(DEPDIR)/dump.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ehandle.Po ./$(DEPDIR)/fields.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/lock.Po ./$(DEPDIR)/md5.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mlib.Po ./$(DEPDIR)/myopt.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/nfmalloc.Po ./$(DEPDIR)/parse.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/parsehelp.Po ./$(DEPDIR)/showcright.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/showpkg.Po ./$(DEPDIR)/star.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/tarfn.Po ./$(DEPDIR)/utils.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/varbuf.Po ./$(DEPDIR)/vercmp.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libdpkg_a_SOURCES) +DIST_SOURCES = $(libdpkg_a_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +pkgconfdir = $(sysconfdir)/@PACKAGE@ +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -DCONFIGDIR=\"$(pkgconfdir)\" \ + -DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \ + $(ZLIB_CFLAGS) $(BZ2_CFLAGS) -.PHONY: all -all:: libdpkg.a +noinst_LIBRARIES = libdpkg.a +libdpkg_a_SOURCES = \ + dpkg.h \ + dpkg-db.h \ + compat.c \ + compression.c \ + database.c \ + dbmodify.c \ + dump.c \ + ehandle.c \ + fields.c \ + gettext.h \ + lock.c \ + md5.c md5.h \ + mlib.c \ + myopt.c myopt.h \ + nfmalloc.c \ + parse.c \ + parsehelp.c \ + parsedump.h \ + showcright.c \ + showpkg.c \ + star.c \ + tarfn.c tarfn.h \ + utils.c \ + varbuf.c \ + vercmp.c -libdpkg.a: $(OBJECTS) - $(AR) r $@ $^ - $(RANLIB) $@ +all: all-am -.PHONY: install -install:: all +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -.PHONY: clean -clean:: - $(RM) $(GENFILES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -.PHONY: distclean -cvslean:: clean - $(RM) Makefile +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libdpkg.a: $(libdpkg_a_OBJECTS) $(libdpkg_a_DEPENDENCIES) + -rm -f libdpkg.a + $(libdpkg_a_AR) libdpkg.a $(libdpkg_a_OBJECTS) $(libdpkg_a_LIBADD) + $(RANLIB) libdpkg.a +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compression.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/database.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmodify.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehandle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fields.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nfmalloc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsehelp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showcright.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showpkg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/star.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tarfn.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/varbuf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vercmp.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +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 -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-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 pdf pdf-am ps ps-am 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. +.NOEXPORT: diff --git a/lib/compression.c b/lib/compression.c index cbfbc975..3e6571e8 100644 --- a/lib/compression.c +++ b/lib/compression.c @@ -5,10 +5,10 @@ #include #include -#ifdef USE_ZLIB +#ifdef WITH_ZLIB #include #endif -#ifdef USE_BZ2LIB +#ifdef WITH_BZ2 #include #endif @@ -29,7 +29,7 @@ void decompress_cat(enum compression_type type, int fd_in, int fd_out, char *des switch(type) { case GZ: -#ifdef USE_ZLIB +#ifdef WITH_ZLIB { char buffer[4096]; int actualread; @@ -60,7 +60,7 @@ void decompress_cat(enum compression_type type, int fd_in, int fd_out, char *des execlp(GZIP,"gzip","-dc",(char*)0); ohshite(_("%s: failed to exec gzip -dc"), v.buf); #endif case BZ2: -#ifdef USE_BZ2LIB +#ifdef WITH_BZ2 { char buffer[4096]; int actualread; @@ -114,7 +114,7 @@ void compress_cat(enum compression_type type, int fd_in, int fd_out, const char switch(type) { case GZ: -#ifdef USE_ZLIB +#ifdef WITH_ZLIB { int actualread, actualwrite; char buffer[4096]; @@ -157,7 +157,7 @@ void compress_cat(enum compression_type type, int fd_in, int fd_out, const char execlp(GZIP,"gzip",combuf,(char*)0); ohshit(_("%s: failed to exec gzip %s"), v.buf, combuf); #endif case BZ2: -#ifdef USE_BZ2LIB +#ifdef WITH_BZ2 { int actualread, actualwrite; char buffer[4096]; diff --git a/include/dpkg-db.h b/lib/dpkg-db.h similarity index 100% rename from include/dpkg-db.h rename to lib/dpkg-db.h diff --git a/include/dpkg.h.in b/lib/dpkg.h similarity index 72% rename from include/dpkg.h.in rename to lib/dpkg.h index bff349ac..e115e2df 100644 --- a/include/dpkg.h.in +++ b/lib/dpkg.h @@ -30,6 +30,20 @@ #include +#ifdef HAVE_SYS_CDEFS_H +#include +#endif + +#ifdef HAVE_STDDEF_H +#include +#endif + +#ifdef PATH_MAX +# define INTERPRETER_MAX PATH_MAX +#else +# define INTERPRETER_MAX 1024 +#endif + #define ARCHIVEVERSION "2.0" #define SPLITVERSION "2.1" #define OLDARCHIVEVERSION "0.939000" @@ -51,7 +65,7 @@ #ifndef ARCHBINFMT #define ARCHBINFMT #endif -#define DPKG_VERSION_ARCH DPKG_VERSION " (" ARCHITECTURE ARCHBINFMT ")" +#define DPKG_VERSION_ARCH PACKAGE_VERSION " (" ARCHITECTURE ARCHBINFMT ")" #define NEWCONFFILEFLAG "newconffile" #define NONEXISTENTFLAG "nonexistent" @@ -69,8 +83,6 @@ #define POSTRMFILE "postrm" #define LISTFILE "list" -#define ADMINDIR "#ADMINDIR#" -#define CONFIGDIR "#CONFIGDIR#" #define STATUSFILE "status" #define AVAILFILE "available" #define LOCKFILE "lock" @@ -88,7 +100,6 @@ #define IMPORTANTFMT "%04d" /* change => also change lib/database.c:cleanup_updates */ #define MAXUPDATES 50 -#define LIBDIR "#LIBDIR#" #define LOCALLIBDIR "/usr/local/lib/dpkg" #define METHODSDIR "methods" @@ -143,6 +154,20 @@ extern const char thisname[]; /* defined separately in each program */ extern const char printforhelp[]; +#if HAVE_C_ATTRIBUTE +# define CONSTANT __attribute__((constant)) +# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc))) +# define NONRETURNING __attribute__((noreturn)) +# define UNUSED __attribute__((unused)) +# define NONRETURNPRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc),noreturn)) +#else +# define CONSTANT +# define PRINTFFORMAT(si, tc) +# define NONRETURNING +# define UNUSED +# define NONRETURNPRINTFFORMAT(si, tc) +#endif + /*** from startup.c ***/ #define standard_startup(ejbuf, argc, argv, prog, loadcfg, cmdinfos) do {\ @@ -236,44 +261,86 @@ struct buffer_data { int type; }; -#define fd_md5(fd, hash, limit, desc...)\ +#if HAVE_C99 +# define fd_md5(fd, hash, limit, ...)\ + buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ + hash, BUFFER_WRITE_MD5, NULL, \ + limit, __VA_ARGS__) +# define stream_md5(file, hash, limit, ...)\ + buffer_copy_setup_PtrPtr(file, BUFFER_READ_STREAM, NULL, \ + hash, BUFFER_WRITE_MD5, NULL, \ + limit, __VA_ARGS__) +# define fd_fd_copy(fd1, fd2, limit, ...)\ + buffer_copy_setup_IntInt(fd1, BUFFER_READ_FD, NULL, \ + fd2, BUFFER_WRITE_FD, NULL, \ + limit, __VA_ARGS__) +# define fd_buf_copy(fd, buf, limit, ...)\ + buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ + buf, BUFFER_WRITE_BUF, NULL, \ + limit, __VA_ARGS__) +# define fd_vbuf_copy(fd, buf, limit, ...)\ + buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ + buf, BUFFER_WRITE_VBUF, NULL, \ + limit, __VA_ARGS__) +# define fd_null_copy(fd, limit, ...) \ + if (lseek(fd, limit, SEEK_CUR) == -1) { \ + if(errno != ESPIPE) ohshite(__VA_ARGS__); \ + buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ + 0, BUFFER_WRITE_NULL, NULL, \ + limit, __VA_ARGS__);\ + } +# define stream_null_copy(file, limit, ...) \ + if (fseek(file, limit, SEEK_CUR) == -1) { \ + if(errno != EBADF) ohshite(__VA_ARGS__); \ + buffer_copy_setup_PtrPtr(file, BUFFER_READ_STREAM, NULL, \ + 0, BUFFER_WRITE_NULL, NULL, \ + limit, __VA_ARGS__);\ + } +# define stream_fd_copy(file, fd, limit, ...)\ + buffer_copy_setup_PtrInt(file, BUFFER_READ_STREAM, NULL, \ + fd, BUFFER_WRITE_FD, NULL, \ + limit, __VA_ARGS__) +#else /* HAVE_C99 */ +# define fd_md5(fd, hash, limit, desc...)\ buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ hash, BUFFER_WRITE_MD5, NULL, \ limit, desc) -#define stream_md5(file, hash, limit, desc...)\ +# define stream_md5(file, hash, limit, desc...)\ buffer_copy_setup_PtrPtr(file, BUFFER_READ_STREAM, NULL, \ hash, BUFFER_WRITE_MD5, NULL, \ limit, desc) -#define fd_fd_copy(fd1, fd2, limit, desc...)\ +# define fd_fd_copy(fd1, fd2, limit, desc...)\ buffer_copy_setup_IntInt(fd1, BUFFER_READ_FD, NULL, \ fd2, BUFFER_WRITE_FD, NULL, \ limit, desc) -#define fd_buf_copy(fd, buf, limit, desc...)\ +# define fd_buf_copy(fd, buf, limit, desc...)\ buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ buf, BUFFER_WRITE_BUF, NULL, \ limit, desc) -#define fd_vbuf_copy(fd, buf, limit, desc...)\ +# define fd_vbuf_copy(fd, buf, limit, desc...)\ buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ buf, BUFFER_WRITE_VBUF, NULL, \ limit, desc) -#define fd_null_copy(fd, limit, desc...) \ +# define fd_null_copy(fd, limit, desc...) \ if (lseek(fd, limit, SEEK_CUR) == -1) { \ if(errno != ESPIPE) ohshite(desc); \ buffer_copy_setup_IntPtr(fd, BUFFER_READ_FD, NULL, \ 0, BUFFER_WRITE_NULL, NULL, \ limit, desc);\ } -#define stream_null_copy(file, limit, desc...) \ +# define stream_null_copy(file, limit, desc...) \ if (fseek(file, limit, SEEK_CUR) == -1) { \ if(errno != EBADF) ohshite(desc); \ buffer_copy_setup_PtrPtr(file, BUFFER_READ_STREAM, NULL, \ 0, BUFFER_WRITE_NULL, NULL, \ limit, desc);\ } -#define stream_fd_copy(file, fd, limit, desc...)\ +# define stream_fd_copy(file, fd, limit, desc...)\ buffer_copy_setup_PtrInt(file, BUFFER_READ_STREAM, NULL, \ fd, BUFFER_WRITE_FD, NULL, \ limit, desc) +#endif /* HAVE_C99 */ + off_t buffer_copy_setup_PtrInt(void *p, int typeIn, void *procIn, int i, int typeOut, void *procOut, off_t limit, const char *desc, ...); @@ -312,4 +379,64 @@ enum compression_type { CAT, GZ, BZ2 }; void decompress_cat(enum compression_type type, int fd_in, int fd_out, char *desc, ...) NONRETURNING; void compress_cat(enum compression_type type, int fd_in, int fd_out, const char *compression, char *desc, ...) NONRETURNING; +/*** from compat.c ***/ + +#ifndef HAVE_STRERROR +const char *strerror(int); +#endif + +#ifndef HAVE_STRSIGNAL +const char *strsignal(int); +#endif + +#ifndef HAVE_SCANDIR +struct dirent; +int scandir(const char *dir, struct dirent ***namelist, + int (*select)(const struct dirent *), + int (*compar)(const void*, const void*)); +#endif + +#ifndef HAVE_ALPHASORT +struct dirent; +int alphasort(const struct dirent *a, const struct dirent *b); +#endif + +#ifndef HAVE_UNSETENV +void unsetenv(const char *x); +#endif + +/*** other compatibility functions ***/ + +#ifndef HAVE_STRTOUL +#define strtoul strtol +#endif + +#ifndef HAVE_VA_COPY +#define va_copy(dest, src) (dest) = (src) +#endif + +/* Define WCOREDUMP if we don't have it already - coredumps won't be + * detected, though. + */ +#ifndef WCOREDUMP +#define WCOREDUMP(x) 0 +#endif + +/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default. + * */ +#ifndef BUILDOLDPKGFORMAT +#define BUILDOLDPKGFORMAT 0 +#endif + +/* Take care of NLS matters. */ + +#include +#if HAVE_LOCALE_H +# include +#endif + +/* Make gettext a little friendlier */ +#define _(String) gettext (String) +#define N_(String) gettext_noop (String) + #endif /* DPKG_H */ diff --git a/lib/gettext.h b/lib/gettext.h new file mode 100644 index 00000000..8b262f4c --- /dev/null +++ b/lib/gettext.h @@ -0,0 +1,69 @@ +/* Convenience header for conditional use of GNU . + Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LIBGETTEXT_H +#define _LIBGETTEXT_H 1 + +/* NLS can be disabled through the configure --disable-nls option. */ +#if ENABLE_NLS + +/* Get declarations of GNU message catalog functions. */ +# include + +#else + +/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which + chokes if dcgettext is defined as a macro. So include it now, to make + later inclusions of a NOP. We don't include + as well because people using "gettext.h" will not include , + and also including would fail on SunOS 4, whereas + is OK. */ +#if defined(__sun) +# include +#endif + +/* Disabled NLS. + The casts to 'const char *' serve the purpose of producing warnings + for invalid uses of the value returned from these functions. + On pre-ANSI systems without 'const', the config.h file is supposed to + contain "#define const". */ +# define gettext(Msgid) ((const char *) (Msgid)) +# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) +# define ngettext(Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dngettext(Domainname, Msgid1, Msgid2, N) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ + ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) +# define textdomain(Domainname) ((const char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) + +#endif + +/* A pseudo function call that serves as a marker for the automated + extraction of messages, but does not call gettext(). The run-time + translation is done at a different place in the code. + The argument, String, should be a literal string. Concatenated strings + and other string expressions won't work. + The macro's expansion is not parenthesized, so that it is suitable as + initializer for static 'char[]' or 'const char[]' variables. */ +#define gettext_noop(String) String + +#endif /* _LIBGETTEXT_H */ diff --git a/lib/md5.h b/lib/md5.h index 3d1c46d3..6333725c 100644 --- a/lib/md5.h +++ b/lib/md5.h @@ -25,6 +25,14 @@ #define md5byte unsigned char +#if SIZEOF_UNSIGNED_LONG==4 +# define UWORD32 unsigned long +#elif SIZEOF_UNSIGNED_INT==4 +# define UWORD32 unsigned int +#else +# error I do not know what to use for a UWORD32. +#endif + struct MD5Context { UWORD32 buf[4]; UWORD32 bytes[2]; diff --git a/lib/mlib.c b/lib/mlib.c index d8d0be00..f8c4877d 100644 --- a/lib/mlib.c +++ b/lib/mlib.c @@ -189,7 +189,7 @@ off_t buffer_write(buffer_data_t data, void *buf, off_t length, const char *desc switch(data->type) { case BUFFER_WRITE_BUF: memcpy(data->data.ptr, buf, length); - (char*)data->data.ptr += length; + data->data.ptr += length; break; case BUFFER_WRITE_VBUF: varbufaddbuf((struct varbuf *)data->data.ptr, buf, length); diff --git a/include/myopt.h b/lib/myopt.h similarity index 100% rename from include/myopt.h rename to lib/myopt.h diff --git a/include/parsedump.h b/lib/parsedump.h similarity index 100% rename from include/parsedump.h rename to lib/parsedump.h diff --git a/lib/tarfn.c b/lib/tarfn.c index 710e2ed2..458d2d98 100644 --- a/lib/tarfn.c +++ b/lib/tarfn.c @@ -4,6 +4,8 @@ * Copyright (C) 1995 Bruce Perens * This is free software under the GNU General Public License. */ +#include + #include #include #include @@ -152,16 +154,18 @@ TarExtractor( } break; } - if (next_long_name) { - h.Name = next_long_name; - } + if ( h.Type != GNU_LONGLINK && h.Type != GNU_LONGNAME ) { + if (next_long_name) { + h.Name = next_long_name; + } - if (next_long_link) { - h.LinkName = next_long_link; - } + if (next_long_link) { + h.LinkName = next_long_link; + } - next_long_name = NULL; - next_long_link = NULL; + next_long_link = NULL; + next_long_name = NULL; + } if ( h.Name[0] == '\0' ) { errno = 0; /* Indicates broken tarfile */ diff --git a/include/tarfn.h b/lib/tarfn.h similarity index 100% rename from include/tarfn.h rename to lib/tarfn.h diff --git a/m4/arch.m4 b/m4/arch.m4 new file mode 100644 index 00000000..f91686f4 --- /dev/null +++ b/m4/arch.m4 @@ -0,0 +1,90 @@ +# DPKG_CPU_TYPE +# ------------- +# Parse the target cpu name and check it against a list of special cases to +# determine what type it is. +AC_DEFUN([DPKG_CPU_TYPE], +[AC_MSG_CHECKING([cpu type]) +case "$target_cpu" in + i386|i486|i586|i686|pentium) + cpu_type="i386" + ;; + alpha*) + cpu_type="alpha" + ;; + arm*) + cpu_type="arm" + ;; + hppa*) + cpu_type="hppa" + ;; + sparc|sparc64) + cpu_type="sparc" + ;; + mips|mipseb) + cpu_type="mips" + ;; + powerpc|ppc) + cpu_type="powerpc" + ;; + *) + cpu_type=$target_cpu + ;; +esac +AC_MSG_RESULT([$cpu_type]) +])# DPKG_CPU_TYPE + +# DPKG_OS_TYPE +# ------------ +# Parse the target operating system name and check it against a list of +# special cases to determine what type it is. +AC_DEFUN([DPKG_OS_TYPE], +[AC_MSG_CHECKING([operating system type]) +case "$target_os" in + linux*-gnu*) + os_type="linux" + ;; + darwin*) + os_type="darwin" + ;; + freebsd*) + os_type="freebsd" + ;; + gnu*) + os_type="gnu" + ;; + kfreebsd*-gnu*) + os_type="kfreebsd-gnu" + ;; + knetbsd*-gnu*) + os_type="knetbsd-gnu" + ;; + netbsd*) + os_type="netbsd" + ;; + openbsd*) + os_type="openbsd" + ;; + *) + os_type=$target_os + ;; +esac +AC_MSG_RESULT([$os_type]) +])# DPKG_OS_TYPE + +# DPKG_ARCHITECTURE +# ------------------------ +# Locate the target operating system in the archtable, sets ARCHITECTURE +AC_DEFUN([DPKG_ARCHITECTURE], +[DPKG_CPU_TYPE +DPKG_OS_TYPE +AC_MSG_CHECKING([Debian architecture name]) +dpkg_archset="`awk '[$]1 == "'$cpu_type-$os_type'" { print [$]2 }' $srcdir/archtable`" +if test "x$dpkg_archset" = "x"; then + dpkg_archset=$cpu_type-$os_type + AC_MSG_RESULT([$dpkg_archset, but not found in archtable]) +else + AC_MSG_RESULT([$dpkg_archset]) +fi +AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", + [Set this to the canonical Debian architecture string for this CPU type.]) +])# DPKG_ARCHITECTURE diff --git a/m4/codeset.m4 b/m4/codeset.m4 new file mode 100644 index 00000000..59535ebc --- /dev/null +++ b/m4/codeset.m4 @@ -0,0 +1,23 @@ +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi +]) diff --git a/m4/compiler.m4 b/m4/compiler.m4 new file mode 100644 index 00000000..d722ab5b --- /dev/null +++ b/m4/compiler.m4 @@ -0,0 +1,104 @@ +# Copyright © 2004 Scott James Remnant . + +# SJR_COMPILER_WARNINGS +# --------------------- +# Add configure option to enable additional compiler warnings and treat +# them as errors. +AC_DEFUN([SJR_COMPILER_WARNINGS], +[AC_ARG_ENABLE(compiler-warnings, + AS_HELP_STRING([--enable-compiler-warnings], + [Enable additional compiler warnings]), +[if test "x$enable_compiler_warnings" = "xyes"; then + if test "x$GCC" = "xyes"; then + CFLAGS="-Wall -Werror $CFLAGS" + fi + if test "x$GXX" = "xyes"; then + CXXFLAGS="-Wall -Werror $CXXFLAGS" + fi +fi])dnl +]) + +# SJR_COMPILER_OPTIMISATIONS +# -------------------------- +# Add configure option to disable optimisations. +AC_DEFUN([SJR_COMPILER_OPTIMISATIONS], +[AC_ARG_ENABLE(compiler-optimisations, + AS_HELP_STRING([--disable-compiler-optimisations], + [Disable compiler optimisations]), +[if test "x$enable_compiler_optimisations" = "xno"; then + [CFLAGS=`echo "$CFLAGS" | sed -e "s/ -O[1-9]*\b/ -O0/g"`] +fi])dnl +]) + +# DPKG_C_ATTRIBUTE +# ---------------- +# Check whether the C compiler supports __attribute__, defines HAVE_C_ATTRIBUTE +AC_DEFUN([DPKG_C_ATTRIBUTE], +[AC_CACHE_CHECK([whether compiler supports __attribute__], [dpkg_cv_attribute], +[AC_TRY_COMPILE([], +[extern int testfunction(int x) __attribute__((unused)) +], + [dpkg_cv_attribute=yes], + [dpkg_cv_attribute=no])]) +AS_IF([test "x$dpkg_cv_attribute" = "xyes"], + [AC_DEFINE([HAVE_C_ATTRIBUTE], 1, + [Define to 1 if compiler supports `__attribute__', 0 otherwise.])], + [AC_DEFINE([HAVE_C_ATTRIBUTE], 0)])dnl +])# DPKG_C_ATTRIBUTE + +# DPKG_TRY_C99([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------------------ +# Try compiling some C99 code to see whether it works +AC_DEFUN([DPKG_TRY_C99], +[AC_TRY_COMPILE([ +#include +#include +#include + + +/* Variadic macro arguments */ +#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__) +], +[ + /* Compound initialisers */ + struct { int a, b; } foo = { .a = 1, .b = 2 }; + + /* Boolean type */ + bool bar = false; + + /* Specific size type */ + uint32_t baz = 0; + + /* C99-style for-loop declarations */ + for (int i = 0; i < 10; i++) + continue; + + /* Magic __func__ variable */ + printf("%s", __func__); +], [$1], [$2])dnl +])# DPKG_TRY_C99 + +# DPKG_C_C99 +# ---------- +# Check whether the compiler can do C99 +AC_DEFUN([DPKG_C_C99], +[AC_CACHE_CHECK([whether compiler supports C99 features], [dpkg_cv_c99], + [DPKG_TRY_C99([dpkg_cv_c99=yes], [dpkg_cv_c99=no])]) +AS_IF([test "x$dpkg_cv_c99" = "xyes"], + [AC_DEFINE([HAVE_C99], 1, [Define to 1 if the compiler supports C99.])], + [AC_CACHE_CHECK([what argument makes compiler support C99 features], + [dpkg_cv_c99_arg], + [dpkg_cv_c99_arg=none + dpkg_save_CC="$CC" + for arg in "-std=gnu99" "-std=c99" "-c99"; do + CC="$dpkg_save_CC $arg" + DPKG_TRY_C99([dpkg_arg_worked=yes], [dpkg_arg_worked=no]) + CC="$dpkg_save_CC" + + AS_IF([test "x$dpkg_arg_worked" = "xyes"], + [dpkg_cv_c99_arg="$arg"; break]) + done]) + AS_IF([test "x$dpkg_cv_c99_arg" != "xnone"], + [CC="$CC $dpkg_cv_c99_arg" + AC_DEFINE([HAVE_C99], 1)])])[]dnl +])# DPKG_C_C99 \ No newline at end of file diff --git a/m4/funcs.m4 b/m4/funcs.m4 new file mode 100644 index 00000000..f9dafee2 --- /dev/null +++ b/m4/funcs.m4 @@ -0,0 +1,28 @@ +# DPKG_FUNC_VA_COPY +# ----------------- +# Define HAVE_VA_COPY if we have va_copy, fail if they can't be assigned +AC_DEFUN([DPKG_FUNC_VA_COPY], +[AC_CACHE_CHECK([for va_copy], [dpkg_cv_va_copy], +[AC_TRY_RUN( +[#include +main() { +va_list v1, v2; +va_copy (v1, v2); +exit (0); +}], + [dpkg_cv_va_copy=yes], + [dpkg_cv_va_copy=no])]) +AS_IF([test "x$dpkg_cv_va_copy" = "xyes"], + [AC_DEFINE([HAVE_VA_COPY], 1, + [Define to 1 if the `va_copy' macro exists])], + [AC_CACHE_CHECK([for va_list assignment by copy], + [dpkg_cv_va_list_copy], +[AC_TRY_COMPILE( +[#include +], +[va_list v1, v2; +v1 = v2; +], + [dpkg_cv_va_list_copy=yes], + [dpkg_cv_va_list_copy=no])])]) +])# DPKG_FUNC_VA_COPY diff --git a/m4/gettext.m4 b/m4/gettext.m4 new file mode 100644 index 00000000..a374f03f --- /dev/null +++ b/m4/gettext.m4 @@ -0,0 +1,487 @@ +# gettext.m4 serial 28 (gettext-0.13) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define(gt_included_intl, ifelse([$1], [external], [no], [yes])) + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Set USE_NLS. + AM_NLS + + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + + dnl Add a version number to the cache macros. + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) + + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi + + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo + fi + ]) + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no + fi + fi + + AC_MSG_CHECKING([whether to use NLS]) + AC_MSG_RESULT([$USE_NLS]) + if test "$USE_NLS" = "yes"; then + AC_MSG_CHECKING([where the gettext function comes from]) + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + AC_MSG_RESULT([$gt_source]) + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATOBJEXT) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) + + dnl For backward compatibility. Some Makefiles may be using this. + if test "$USE_INCLUDED_LIBINTL" = yes; then + INTLOBJS="\$(GETTOBJS)" + fi + AC_SUBST(INTLOBJS) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + ]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) + + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) + + +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([bh_C_SIGNED])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl + AC_REQUIRE([gt_TYPE_WCHAR_T])dnl + AC_REQUIRE([gt_TYPE_WINT_T])dnl + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gt_TYPE_INTMAX_T]) + AC_REQUIRE([gt_PRINTF_POSIX]) + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gt_INTDIV0])dnl + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl + AC_REQUIRE([gt_INTTYPES_PRI])dnl + AC_REQUIRE([gl_XSIZE])dnl + + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) + ]) + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ +__fsetlocking]) + + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). + gt_CHECK_DECL(_snprintf, [#include ]) + gt_CHECK_DECL(_snwprintf, [#include ]) + + dnl Use the *_unlocked functions only if they are declared. + dnl (because some of them were defined without being declared in Solaris + dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built + dnl on Solaris 2.5.1 to run on Solaris 2.6). + dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. + gt_CHECK_DECL(feof_unlocked, [#include ]) + gt_CHECK_DECL(fgets_unlocked, [#include ]) + gt_CHECK_DECL(getc_unlocked, [#include ]) + + case $gt_cv_func_printf_posix in + *yes) HAVE_POSIX_PRINTF=1 ;; + *) HAVE_POSIX_PRINTF=0 ;; + esac + AC_SUBST([HAVE_POSIX_PRINTF]) + if test "$ac_cv_func_asprintf" = yes; then + HAVE_ASPRINTF=1 + else + HAVE_ASPRINTF=0 + fi + AC_SUBST([HAVE_ASPRINTF]) + if test "$ac_cv_func_snprintf" = yes; then + HAVE_SNPRINTF=1 + else + HAVE_SNPRINTF=0 + fi + AC_SUBST([HAVE_SNPRINTF]) + if test "$ac_cv_func_wprintf" = yes; then + HAVE_WPRINTF=1 + else + HAVE_WPRINTF=0 + fi + AC_SUBST([HAVE_WPRINTF]) + + AM_ICONV + AM_LANGINFO_CODESET + if test $ac_cv_header_locale_h = yes; then + AM_LC_MESSAGES + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) + + +dnl gt_CHECK_DECL(FUNC, INCLUDES) +dnl Check whether a function is declared. +AC_DEFUN([gt_CHECK_DECL], +[ + AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, + [AC_TRY_COMPILE([$2], [ +#ifndef $1 + char *p = (char *) $1; +#endif +], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) + if test $ac_cv_have_decl_$1 = yes; then + gt_value=1 + else + gt_value=0 + fi + AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], + [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 new file mode 100644 index 00000000..9c9f3db3 --- /dev/null +++ b/m4/glibc21.m4 @@ -0,0 +1,32 @@ +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) diff --git a/m4/iconv.m4 b/m4/iconv.m4 new file mode 100644 index 00000000..c5f35798 --- /dev/null +++ b/m4/iconv.m4 @@ -0,0 +1,103 @@ +# iconv.m4 serial AM4 (gettext-0.11.3) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 new file mode 100644 index 00000000..55dddcf1 --- /dev/null +++ b/m4/intdiv0.m4 @@ -0,0 +1,72 @@ +# intdiv0.m4 serial 1 (gettext-0.11.3) +dnl Copyright (C) 2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gt_INTDIV0], +[ + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], + gt_cv_int_divbyzero_sigfpe, + [ + AC_TRY_RUN([ +#include +#include + +static void +#ifdef __cplusplus +sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, + [ + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + ]) + ]) + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, + [Define if integer division by zero raises signal SIGFPE.]) +]) diff --git a/m4/intmax.m4 b/m4/intmax.m4 new file mode 100644 index 00000000..dfb08ccc --- /dev/null +++ b/m4/intmax.m4 @@ -0,0 +1,32 @@ +# intmax.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the system has the 'intmax_t' type, but don't attempt to +dnl find a replacement if it is lacking. + +AC_DEFUN([gt_TYPE_INTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, + [AC_TRY_COMPILE([ +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif +], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) + if test $gt_cv_c_intmax_t = yes; then + AC_DEFINE(HAVE_INTMAX_T, 1, + [Define if you have the 'intmax_t' type in or .]) + fi +]) diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 new file mode 100644 index 00000000..fd007c31 --- /dev/null +++ b/m4/inttypes-pri.m4 @@ -0,0 +1,32 @@ +# inttypes-pri.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +# Define PRI_MACROS_BROKEN if exists and defines the PRI* +# macros to non-string values. This is the case on AIX 4.3.3. + +AC_DEFUN([gt_INTTYPES_PRI], +[ + AC_REQUIRE([gt_HEADER_INTTYPES_H]) + if test $gt_cv_header_inttypes_h = yes; then + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], + gt_cv_inttypes_pri_broken, + [ + AC_TRY_COMPILE([#include +#ifdef PRId32 +char *p = PRId32; +#endif +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) + ]) + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + [Define if exists and defines unusable PRI* macros.]) + fi +]) diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 new file mode 100644 index 00000000..ab370ffe --- /dev/null +++ b/m4/inttypes.m4 @@ -0,0 +1,27 @@ +# inttypes.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H if exists and doesn't clash with +# . + +AC_DEFUN([gt_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, + [ + AC_TRY_COMPILE( + [#include +#include ], + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) + ]) + if test $gt_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, + [Define if exists and doesn't clash with .]) + fi +]) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 new file mode 100644 index 00000000..f342eba3 --- /dev/null +++ b/m4/inttypes_h.m4 @@ -0,0 +1,28 @@ +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + jm_ac_cv_header_inttypes_h=no)]) + if test $jm_ac_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 new file mode 100644 index 00000000..ffd4008b --- /dev/null +++ b/m4/lcmessage.m4 @@ -0,0 +1,32 @@ +# lcmessage.m4 serial 3 (gettext-0.11.3) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995. + +# Check whether LC_MESSAGES is available in . + +AC_DEFUN([AM_LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +]) diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 new file mode 100644 index 00000000..38aeaec1 --- /dev/null +++ b/m4/lib-ld.m4 @@ -0,0 +1,112 @@ +# lib-ld.m4 serial 3 (gettext-0.13) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(acl_cv_path_LD, +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 new file mode 100644 index 00000000..eeb200d2 --- /dev/null +++ b/m4/lib-link.m4 @@ -0,0 +1,551 @@ +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + undefine([Name]) + undefine([NAME]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. If found, it +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + undefine([Name]) + undefine([NAME]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, +dnl hardcode_direct, hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE(rpath, + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib$1-prefix], +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 new file mode 100644 index 00000000..8aff5a9d --- /dev/null +++ b/m4/lib-prefix.m4 @@ -0,0 +1,155 @@ +# lib-prefix.m4 serial 3 (gettext-0.13) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) diff --git a/m4/libs.m4 b/m4/libs.m4 new file mode 100644 index 00000000..ccde235c --- /dev/null +++ b/m4/libs.m4 @@ -0,0 +1,62 @@ +# DPKG_LIB_ZLIB +# ------------- +# Check for zlib library. +AC_DEFUN([DPKG_LIB_ZLIB], +[AC_ARG_VAR([ZLIB_CFLAGS], [compiler flags for zlib library])dnl +AC_ARG_VAR([ZLIB_LIBS], [linker flags for zlib library])dnl +AC_ARG_WITH(zlib, + AS_HELP_STRING([--with-zlib], + [use zlib for compression and decompression (yes/static)]), +[case "$with_zlib" in + yes) + ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB" + ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-lz" + ;; + static) + ZLIB_CFLAGS="${ZLIB_CFLAGS:+$ZLIB_CFLAGS }-DWITH_ZLIB" + ZLIB_LIBS="${ZLIB_LIBS:+$ZLIB_LIBS }-Wl,-Bstatic -lz -Wl,-Bdynamic" + ;; +esac]) +])# DPKG_LIB_ZLIB + +# DPKG_LIB_BZ2 +# ------------ +# Check for bz2 library. +AC_DEFUN([DPKG_LIB_BZ2], +[AC_ARG_VAR([BZ2_CFLAGS], [compiler flags for bz2 library])dnl +AC_ARG_VAR([BZ2_LIBS], [linker flags for bz2 library])dnl +AC_ARG_WITH(bz2, + AS_HELP_STRING([--with-bz2], + [use bz2 library for compression and decompression (yes/static)]), +[case "$with_bz2" in + yes) + BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2" + BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-lbz2" + ;; + static) + BZ2_CFLAGS="${BZ2_CFLAGS:+$BZ2_CFLAGS }-DWITH_BZ2" + BZ2_LIBS="${BZ2_LIBS:+$BZ2_LIBS }-Wl,-Bstatic -lbz2 -Wl,-Bdynamic" + ;; +esac]) +])# DPKG_LIB_BZ2 + +# DPKG_LIB_CURSES +# --------------- +# Check for curses library. +AC_DEFUN([DPKG_LIB_CURSES], +[AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl +AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"], + [AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"], + [AC_MSG_WARN([no curses library found])])]) +])# DPKG_LIB_CURSES + +# DPKG_LIB_SSD +# ------------ +# Check for start-stop-daemon libraries. +AC_DEFUN([DPKG_LIB_SSD], +[AC_ARG_VAR([SSD_LIBS], [linker flags for start-stop-daemon])dnl +AC_CHECK_LIB([ihash], [ihash_create], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lihash"]) +AC_CHECK_LIB([ps], [proc_stat_list_create], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lps"]) +AC_CHECK_LIB([shouldbeinlibc], [fmt_past_time], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lshouldbeinlibc"]) +AC_CHECK_LIB([kvm], [kvm_openfiles], [SSD_LIBS="${SSD_LIBS:+$SSD_LIBS }-lkvm"]) +])# DPKG_LIB_SSD diff --git a/m4/linker.m4 b/m4/linker.m4 new file mode 100644 index 00000000..9ac16c4e --- /dev/null +++ b/m4/linker.m4 @@ -0,0 +1,15 @@ +# Copyright © 2004 Scott James Remnant . + +# SJR_LINKER_OPTIMISATIONS +# -------------------------- +# Add configure option to disable linker optimisations. +AC_DEFUN([SJR_LINKER_OPTIMISATIONS], +[AC_ARG_ENABLE(linker-optimisations, + AS_HELP_STRING([--disable-linker-optimisations], + [Disable linker optimisations]), +[if test "x$enable_linker_optimisations" = "xno"; then + [LDFLAGS=`echo "$LDFLAGS" | sed -e "s/ -Wl,-O[0-9]*\b//g"`] +else + [LDFLAGS="$LDFLAGS -Wl,-O1"] +fi], [LDFLAGS="$LDFLAGS -Wl,-O1"])dnl +]) \ No newline at end of file diff --git a/m4/longdouble.m4 b/m4/longdouble.m4 new file mode 100644 index 00000000..1333d2f5 --- /dev/null +++ b/m4/longdouble.m4 @@ -0,0 +1,30 @@ +# longdouble.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the compiler supports the 'long double' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_LONGDOUBLE], +[ + AC_CACHE_CHECK([for long double], gt_cv_c_long_double, + [if test "$GCC" = yes; then + gt_cv_c_long_double=yes + else + AC_TRY_COMPILE([ + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + int array [2*(sizeof(long double) >= sizeof(double)) - 1]; + ], , + gt_cv_c_long_double=yes, gt_cv_c_long_double=no) + fi]) + if test $gt_cv_c_long_double = yes; then + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) + fi +]) diff --git a/m4/longlong.m4 b/m4/longlong.m4 new file mode 100644 index 00000000..d7d7350b --- /dev/null +++ b/m4/longlong.m4 @@ -0,0 +1,25 @@ +# longlong.m4 serial 4 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_LONG_LONG if 'long long' works. + +AC_DEFUN([jm_AC_TYPE_LONG_LONG], +[ + AC_CACHE_CHECK([for long long], ac_cv_type_long_long, + [AC_TRY_LINK([long long ll = 1LL; int i = 63;], + [long long llmax = (long long) -1; + return ll << i | ll >> i | llmax / ll | llmax % ll;], + ac_cv_type_long_long=yes, + ac_cv_type_long_long=no)]) + if test $ac_cv_type_long_long = yes; then + AC_DEFINE(HAVE_LONG_LONG, 1, + [Define if you have the 'long long' type.]) + fi +]) diff --git a/m4/nls.m4 b/m4/nls.m4 new file mode 100644 index 00000000..36bc4931 --- /dev/null +++ b/m4/nls.m4 @@ -0,0 +1,49 @@ +# nls.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) diff --git a/m4/perl.m4 b/m4/perl.m4 new file mode 100644 index 00000000..165f487c --- /dev/null +++ b/m4/perl.m4 @@ -0,0 +1,7 @@ +# DPKG_PROG_PERL +# -------------- +# Locate perl interpreter in the path +AC_DEFUN([DPKG_PROG_PERL], +[AC_ARG_VAR([PERL], [Perl interpreter])dnl +AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])dnl +])# DPKG_PROG_PERL diff --git a/m4/po.m4 b/m4/po.m4 new file mode 100644 index 00000000..e1619988 --- /dev/null +++ b/m4/po.m4 @@ -0,0 +1,426 @@ +# po.m4 serial 3 (gettext-0.14) +dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Checks for all prerequisites of the po subdirectory. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AM_NLS])dnl + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext 0.12 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + AC_MSG_RESULT( + [found $GMSGFMT program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + fi + + AC_OUTPUT_COMMANDS([ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done], + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + +dnl Postprocesses a Makefile in a directory containing PO files. +AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +[ + # When this code is run, in config.status, two variables have already been + # set: + # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, + # - LINGUAS is the value of the environment variable LINGUAS at configure + # time. + +changequote(,)dnl + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + # Find a way to echo strings without interpreting backslash. + if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='echo' + else + if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then + gt_echo='printf %s\n' + else + echo_func () { + cat < "$ac_file.tmp" + if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + cat >> "$ac_file.tmp" < /dev/null; then + # Add dependencies that cannot be formulated as a simple suffix rule. + for lang in $ALL_LINGUAS; do + frobbedlang=`echo $lang | sed -e 's/_/-/g'` + cat >> "$ac_file.tmp" <> "$ac_file.tmp" < +#include +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, + [ + AC_EGREP_CPP(notposix, [ +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif + ], gt_cv_func_printf_posix="guessing no", + gt_cv_func_printf_posix="guessing yes") + ]) + ]) + case $gt_cv_func_printf_posix in + *yes) + AC_DEFINE(HAVE_POSIX_PRINTF, 1, + [Define if your printf() function supports format strings with positions.]) + ;; + esac +]) diff --git a/m4/progtest.m4 b/m4/progtest.m4 new file mode 100644 index 00000000..8fe527ce --- /dev/null +++ b/m4/progtest.m4 @@ -0,0 +1,91 @@ +# progtest.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1996. + +# Search path for a program which passes the given test. + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN([AM_PATH_PROG_WITH_TEST], +[ +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + [[\\/]]* | ?:[[\\/]]*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in ifelse([$5], , $PATH, [$5]); do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) diff --git a/m4/signed.m4 b/m4/signed.m4 new file mode 100644 index 00000000..dc1f54f1 --- /dev/null +++ b/m4/signed.m4 @@ -0,0 +1,19 @@ +# signed.m4 serial 1 (gettext-0.10.40) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([bh_C_SIGNED], +[ + AC_CACHE_CHECK([for signed], bh_cv_c_signed, + [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) + if test $bh_cv_c_signed = no; then + AC_DEFINE(signed, , + [Define to empty if the C compiler doesn't support this keyword.]) + fi +]) diff --git a/m4/size_max.m4 b/m4/size_max.m4 new file mode 100644 index 00000000..5762fc33 --- /dev/null +++ b/m4/size_max.m4 @@ -0,0 +1,61 @@ +# size_max.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gl_SIZE_MAX], +[ + AC_CHECK_HEADERS(stdint.h) + dnl First test whether the system already has SIZE_MAX. + AC_MSG_CHECKING([for SIZE_MAX]) + result= + AC_EGREP_CPP([Found it], [ +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif +], result=yes) + if test -z "$result"; then + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider + dnl than the type 'unsigned long'. + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl which is guaranteed to work from LONG_MIN to LONG_MAX. + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, + [#include ], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include ], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include ], result=?) + if test "$fits_in_uint" = 1; then + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. + AC_TRY_COMPILE([#include + extern size_t foo; + extern unsigned long foo; + ], [], fits_in_uint=0) + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + dnl Shouldn't happen, but who knows... + result='~(size_t)0' + fi + fi + AC_MSG_RESULT([$result]) + if test "$result" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + fi +]) diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 new file mode 100644 index 00000000..32ba7ae7 --- /dev/null +++ b/m4/stdint_h.m4 @@ -0,0 +1,28 @@ +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_STDINT_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_STDINT_H], +[ + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_stdint_h=yes, + jm_ac_cv_header_stdint_h=no)]) + if test $jm_ac_cv_header_stdint_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, + [Define if exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) diff --git a/m4/types.m4 b/m4/types.m4 new file mode 100644 index 00000000..6931f2ad --- /dev/null +++ b/m4/types.m4 @@ -0,0 +1,40 @@ +# DPKG_TYPE_PTRDIFF_T +# ------------------- +# Check for the ptrdiff_t type, defining to int if not defined +AC_DEFUN([DPKG_TYPE_PTRDIFF_T], +[AC_CHECK_TYPE([ptrdiff_t],, + AC_DEFINE_UNQUOTED([ptrdiff_t], [int], + [Define to `int' if does not define.]))dnl +])# DPKG_TYPE_PTRDIFF_T + +# DPKG_DECL_SYS_SIGLIST +# --------------------- +# Check for the sys_siglist variable in either signal.h or unistd.h +AC_DEFUN([DPKG_DECL_SYS_SIGLIST], +[AC_CHECK_HEADERS([unistd.h]) +AC_CHECK_DECLS([sys_siglist],,, +[#include +/* NetBSD declares sys_siglist in unistd.h. */ +#if HAVE_UNISTD_H +# include +#endif +])dnl +])# DPKG_DECL_SYS_SIGLIST + +# DPKG_CHECK_DEFINE([DEFINE], [HEADER]) +# ------------------------------------- +# Defines HAVE_DEFINE to 1 if declared in HEADER, 0 otherwise +AC_DEFUN([DPKG_CHECK_DEFINE], +[AC_CACHE_CHECK([whether $1 is defined in $2], [dpkg_cv_define_$1], +[AC_TRY_COMPILE( +[#include <$2> +], +[int i = $1; +], + [dpkg_cv_define_$1=yes], + [dpkg_cv_define_$1=no])]) +AS_IF([test "x$dpkg_cv_define" = "xyes"], + [AC_DEFINE([HAVE_]$1, 1, [Define to 1 if you have the macro `]$1[' in + `]$2[', and to 0 if you don't.])], + [AC_DEFINE([HAVE_]$1, 0)])[]dnl +])# DPKG_CHECK_DEFINE diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 new file mode 100644 index 00000000..b5f28d44 --- /dev/null +++ b/m4/uintmax_t.m4 @@ -0,0 +1,32 @@ +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +AC_PREREQ(2.13) + +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in or . + +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, + [Define to unsigned long or unsigned long long + if and don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in or .]) + fi +]) diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4 new file mode 100644 index 00000000..1da8b809 --- /dev/null +++ b/m4/ulonglong.m4 @@ -0,0 +1,25 @@ +# ulonglong.m4 serial 3 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. + +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +[ + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, + [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], + [unsigned long long ullmax = (unsigned long long) -1; + return ull << i | ull >> i | ullmax / ull | ullmax % ull;], + ac_cv_type_unsigned_long_long=yes, + ac_cv_type_unsigned_long_long=no)]) + if test $ac_cv_type_unsigned_long_long = yes; then + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, + [Define if you have the 'unsigned long long' type.]) + fi +]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 new file mode 100644 index 00000000..d8fd1ec5 --- /dev/null +++ b/m4/wchar_t.m4 @@ -0,0 +1,22 @@ +# wchar_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether has the 'wchar_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WCHAR_T], +[ + AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, + [AC_TRY_COMPILE([#include + wchar_t foo = (wchar_t)'\0';], , + gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) + if test $gt_cv_c_wchar_t = yes; then + AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) + fi +]) diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 new file mode 100644 index 00000000..3d8d2159 --- /dev/null +++ b/m4/wint_t.m4 @@ -0,0 +1,22 @@ +# wint_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether has the 'wint_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WINT_T], +[ + AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, + [AC_TRY_COMPILE([#include + wint_t foo = (wchar_t)'\0';], , + gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) + if test $gt_cv_c_wint_t = yes; then + AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) + fi +]) diff --git a/m4/xsize.m4 b/m4/xsize.m4 new file mode 100644 index 00000000..9b7cf9b4 --- /dev/null +++ b/m4/xsize.m4 @@ -0,0 +1,14 @@ +# xsize.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_XSIZE], +[ + dnl Prerequisites of lib/xsize.h. + AC_REQUIRE([gl_SIZE_MAX]) + AC_CHECK_HEADERS(stdint.h) +]) diff --git a/main/Makefile b/main/Makefile deleted file mode 100644 index 65ca1c64..00000000 --- a/main/Makefile +++ /dev/null @@ -1,77 +0,0 @@ - -srcdir = . -top_srcdir = .. -top_builddir = .. - -default: all -include ../Makefile.conf - -SOURCES = main.c enquiry.c filesdb.c archives.c processarc.c \ - cleanup.c select.c packages.c configure.c remove.c \ - help.c depcon.c errors.c update.c - -MAN8PAGES = dpkg.8 dpkg-query.8 - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) archtable.h dpkg dpkg-static - -QUERY_SOURCES = query.c filesdb.c errors.c -QUERY_OBJECTS = $(patsubst %.c, %.o, $(QUERY_SOURCES)) -QUERY_GENFILES = $(QUERY_OBJECTS) dpkg-query - -.PHONY: all -all:: dpkg dpkg-query - -ifdef ALSO_STATIC -all:: dpkg-static -endif - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) $(QUERY_GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) dpkg $(DESTDIR)/$(bindir) -ifdef ALSO_STATIC - $(INSTALL_PROGRAM) dpkg-static $(DESTDIR)/$(bindir) -endif - $(INSTALL_PROGRAM) dpkg-query $(DESTDIR)/$(bindir) - $(mkinstalldirs) $(DESTDIR)/$(admindir)/alternatives - $(mkinstalldirs) $(DESTDIR)/$(admindir)/info - $(mkinstalldirs) $(DESTDIR)/$(admindir)/updates - -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \ - done - -dpkg-static: LDFLAGS += -static -dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC) -dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) - -dpkg-query: $(QUERY_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(QUERY_OBJECTS) $(LIBS) $(NLS_LIBS) - -enquiry.o: archtable.h - -archtable.h: $(top_srcdir)/archtable - expand $< | \ - perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \ - if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \ - >$@ diff --git a/main/Makefile.in b/main/Makefile.in deleted file mode 100644 index fcaabc0b..00000000 --- a/main/Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. - -default: all -include ../Makefile.conf - -SOURCES = main.c enquiry.c filesdb.c archives.c processarc.c \ - cleanup.c select.c packages.c configure.c remove.c \ - help.c depcon.c errors.c update.c - -MAN8PAGES = dpkg.8 dpkg-query.8 - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) archtable.h dpkg dpkg-static - -QUERY_SOURCES = query.c filesdb.c errors.c -QUERY_OBJECTS = $(patsubst %.c, %.o, $(QUERY_SOURCES)) -QUERY_GENFILES = $(QUERY_OBJECTS) dpkg-query - -.PHONY: all -all:: dpkg dpkg-query - -ifdef ALSO_STATIC -all:: dpkg-static -endif - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) $(QUERY_GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) dpkg $(DESTDIR)/$(bindir) -ifdef ALSO_STATIC - $(INSTALL_PROGRAM) dpkg-static $(DESTDIR)/$(bindir) -endif - $(INSTALL_PROGRAM) dpkg-query $(DESTDIR)/$(bindir) - $(mkinstalldirs) $(DESTDIR)/$(admindir)/alternatives - $(mkinstalldirs) $(DESTDIR)/$(admindir)/info - $(mkinstalldirs) $(DESTDIR)/$(admindir)/updates - -.PHONY: install-doc -install-doc: - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \ - done - -dpkg-static: LDFLAGS += -static -dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC) -dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS) - -dpkg-query: $(QUERY_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(QUERY_OBJECTS) $(LIBS) $(NLS_LIBS) - -enquiry.o: archtable.h - -archtable.h: $(top_srcdir)/archtable - expand $< | \ - perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \ - if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \ - >$@ diff --git a/scripts/822-date.1 b/man/C/822-date.1 similarity index 100% rename from scripts/822-date.1 rename to man/C/822-date.1 diff --git a/man/C/Makefile.am b/man/C/Makefile.am new file mode 100644 index 00000000..39ce5616 --- /dev/null +++ b/man/C/Makefile.am @@ -0,0 +1,43 @@ +## Process this file with automake to produce Makefile.in + +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-architecture.1 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dpkg.cfg.5 \ + dselect.1 \ + dselect.cfg.5 \ + install-info.8 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 + +dpkg_source_aliases = \ + dpkg-buildpackage.1 \ + dpkg-distaddfile.1 \ + dpkg-genchanges.1 \ + dpkg-gencontrol.1 \ + dpkg-parsechangelog.1 \ + dpkg-shlibdeps.1 + +man_MANS = $(dpkg_source_aliases) +CLEANFILES = $(dpkg_source_aliases) + + +$(dpkg_source_aliases): + echo ".so man1/dpkg-source.1" > $@ + chmod 644 $@ diff --git a/man/C/Makefile.in b/man/C/Makefile.in new file mode 100644 index 00000000..4b393979 --- /dev/null +++ b/man/C/Makefile.in @@ -0,0 +1,537 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/C +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) $(man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-architecture.1 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dpkg.cfg.5 \ + dselect.1 \ + dselect.cfg.5 \ + install-info.8 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 + +dpkg_source_aliases = \ + dpkg-buildpackage.1 \ + dpkg-distaddfile.1 \ + dpkg-genchanges.1 \ + dpkg-gencontrol.1 \ + dpkg-parsechangelog.1 \ + dpkg-shlibdeps.1 + +man_MANS = $(dpkg_source_aliases) +CLEANFILES = $(dpkg_source_aliases) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/C/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/C/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 + + +$(dpkg_source_aliases): + echo ".so man1/dpkg-source.1" > $@ + chmod 644 $@ +# 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/scripts/cleanup-info.8 b/man/C/cleanup-info.8 similarity index 100% rename from scripts/cleanup-info.8 rename to man/C/cleanup-info.8 diff --git a/man/en/deb-control.5 b/man/C/deb-control.5 similarity index 100% rename from man/en/deb-control.5 rename to man/C/deb-control.5 diff --git a/man/en/deb-old.5 b/man/C/deb-old.5 similarity index 100% rename from man/en/deb-old.5 rename to man/C/deb-old.5 diff --git a/man/en/deb.5 b/man/C/deb.5 similarity index 100% rename from man/en/deb.5 rename to man/C/deb.5 diff --git a/man/C/dpkg-architecture.1 b/man/C/dpkg-architecture.1 new file mode 100644 index 00000000..3efa8d3f --- /dev/null +++ b/man/C/dpkg-architecture.1 @@ -0,0 +1,174 @@ +.TH DPKG-ARCHITECTURE 1 "2005-01-10" "Debian GNU/Linux" +.SH "NAME" +dpkg\-architecture \- set and determine the architecture for package building +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +dpkg-architecture [options] [action] +.PP +Valid options: +\&\fB\-a\fRDebian-Architecture +\&\fB\-t\fRGnu-System-Type +\&\fB\-f\fR +.PP +Valid actions: +\&\fB\-l\fR, \fB\-q\fRVariable\-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +dpkg-architecture does provide a facility to determine and set the build and +host architecture for package building. +.SH "OVERVIEW" +.IX Header "OVERVIEW" +The build architecture is always determined by an external call to dpkg, and +can not be set at the command line. +.PP +You can specify the host architecture by providing one or both of the options \fB\-a\fR +and \fB\-t\fR. The default is determined by an external call to gcc, or the same as +the build architecture if \s-1CC\s0 or gcc are both not available. One out of \fB\-a\fR and \fB\-t\fR +is sufficient, the value of the other will be set to a usable default. +Indeed, it is often better to only specify one, because dpkg-architecture +will warn you if your choice doesn't match the default. +.PP +The default action is \fB\-l\fR, which prints the environment variales, one each line, +in the format VARIABLE=value. If you are only interested in the value of a +single variable, you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export +command. This can be used to set the environment variables using eval. \fB\-u\fR +does return a similar command to unset all variables. \fB\-c\fR does execute a +command in an environment which has all variables set to the determined +value. +.PP +Existing environment variables with the same name as used by the scripts are +not overwritten, except if the \fB\-f\fR force flag is present. This allows the user +to override a value even when the call to dpkg-architecture is buried in +some other script (for example dpkg\-buildpackage). +.SH "TERMS" +.IX Header "TERMS" +.IP "build machine" 4 +.IX Item "build machine" +The machine the package is built on. +.IP "host machine" 4 +.IX Item "host machine" +The machine the package is built for. +.IP "Debian Architecture" 4 +.IX Item "Debian Architecture" +The Debian archietcture string, which specifies the binary tree in the \s-1FTP\s0 +archive. Examples: i386, sparc, hurd\-i386. +.IP "\s-1GNU\s0 System Type" 4 +.IX Item "GNU System Type" +An architecture specification string consisting of two or three parts, +cpu-system or cpu\-vendor\-system. Examples: i386\-linux, sparc\-linux, i386\-gnu. +.SH "EXAMPLES" +.IX Header "EXAMPLES" +dpkg-buildpackage accepts the \fB\-a\fR option and passes it to dpkg\-architecture. +Other examples: +.PP +CC=i386\-gnu\-gcc dpkg-architecture \f(CW\*(C`\-c\*(C'\fR debian/rules build +.PP +eval `dpkg\-architecture \f(CW\*(C`\-u\*(C'\fR` +.SH "VARIABLES" +.IX Header "VARIABLES" +The following variables are set by dpkg\-architecture: +.IP "\s-1DEB_BUILD_ARCH\s0" 4 +.IX Item "DEB_BUILD_ARCH" +The Debian architecture of the build machine. +.IP "\s-1DEB_BUILD_GNU_TYPE\s0" 4 +.IX Item "DEB_BUILD_GNU_TYPE" +The \s-1GNU\s0 system type of the build machine. +.IP "\s-1DEB_BUILD_GNU_CPU\s0" 4 +.IX Item "DEB_BUILD_GNU_CPU" +The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0 +.IP "\s-1DEB_BUILD_GNU_SYSTEM\s0" 4 +.IX Item "DEB_BUILD_GNU_SYSTEM" +The System part of \s-1DEB_BUILD_GNU_TYPE\s0 +.IP "\s-1DEB_HOST_ARCH\s0" 4 +.IX Item "DEB_HOST_ARCH" +The Debian architecture of the host machine. +.IP "\s-1DEB_HOST_GNU_TYPE\s0" 4 +.IX Item "DEB_HOST_GNU_TYPE" +The \s-1GNU\s0 system type of the host machine. +.IP "\s-1DEB_HOST_GNU_CPU\s0" 4 +.IX Item "DEB_HOST_GNU_CPU" +The \s-1CPU\s0 part of \s-1DEB_HOST_GNU_TYPE\s0 +.IP "\s-1DEB_HOST_GNU_SYSTEM\s0" 4 +.IX Item "DEB_HOST_GNU_SYSTEM" +The System part of \s-1DEB_HOST_GNU_TYPE\s0 +.SH "DEBIAN/RULES" +.IX Header "DEBIAN/RULES" +The environment variables set by dpkg-architecture are passed to +debian/rules as make variables (see make documentation). However, you +should not rely on them, as this breaks manual invocation of the +script. Instead, you should always initialize them using +dpkg-architecture with the \-q option. Here are some examples, which +also show how you can improve the cross compilation support in your +package: +.PP +Instead of: +.PP +ARCH=`dpkg \-\-print\-architecture` +configure $(\s-1ARCH\s0)\-linux +.PP +please use the following: +.PP +\&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg-architecture \-qDEB_BUILD_GNU_TYPE) +\&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg-architecture \-qDEB_HOST_GNU_TYPE) +.PP +configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0) +.PP +Instead of: +.PP +ARCH=`dpkg \-\-print\-architecture` +ifeq ($(\s-1ARCH\s0),alpha) + ... +endif +.PP +please use: +.PP +\&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg-architecture \-qDEB_HOST_ARCH) +.PP +ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha) + ... +endif +.PP +In general, calling dpkg in the rules file to get architecture information +is deprecated (until you want to provide backward compatibility, see below). +Especially the \-\-print\-architecture option is unreliable since we have +Debian architectures which don't equal a processor name. +.SH "BACKWARD COMPATIBILITY" +.IX Header "BACKWARD COMPATIBILITY" +When providing a new facility, it is always a good idea to stay +compatible with old versions of the programs. Note that +dpkg-architecture does not affect old debian/rules files, so the only +thing to consider is using old versions of dpkg-dev with new +debian/rules files. The following does the job: +.PP +\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture) +\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0)) +ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),) + \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu +else + \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux +endif +DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0) +.PP +\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0) +\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0) +\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0) +\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0) +.PP +Put a subset of these lines at the top of your debian/rules file; these +default values will be overwritten if dpkg-architecture is used. +.PP +You don't need the full set. Choose a consistent set which contains the +values you use in the rules file. For example, if you only need the host +Debian architecture, `DEB_HOST_ARCH=`dpkg \-\-print\-architecture` +is sufficient (this is indeed the Debian architecture of the build machine, +but remember that we are only trying to be backward compatible with native +compilation). +.SH "SEE ALSO" +.IX Header "SEE ALSO" +dpkg-buildpackage +dpkg-cross +.SH "CONTACT" +.IX Header "CONTACT" +If you have questions about the usage of the make variables in your rules +files, or about cross compilation support in your packages, please email me. +The address is Marcus Brinkmann . diff --git a/scripts/dpkg-checkbuilddeps.1 b/man/C/dpkg-checkbuilddeps.1 similarity index 100% rename from scripts/dpkg-checkbuilddeps.1 rename to man/C/dpkg-checkbuilddeps.1 diff --git a/dpkg-deb/dpkg-deb.1 b/man/C/dpkg-deb.1 similarity index 100% rename from dpkg-deb/dpkg-deb.1 rename to man/C/dpkg-deb.1 diff --git a/scripts/dpkg-divert.8 b/man/C/dpkg-divert.8 similarity index 100% rename from scripts/dpkg-divert.8 rename to man/C/dpkg-divert.8 diff --git a/scripts/dpkg-name.1 b/man/C/dpkg-name.1 similarity index 100% rename from scripts/dpkg-name.1 rename to man/C/dpkg-name.1 diff --git a/main/dpkg-query.8 b/man/C/dpkg-query.1 similarity index 96% rename from main/dpkg-query.8 rename to man/C/dpkg-query.1 index 4f34554f..f2143ffb 100644 --- a/main/dpkg-query.8 +++ b/man/C/dpkg-query.1 @@ -1,4 +1,4 @@ -.TH DPKG\-QUERY 8 "August 2001" "Debian Project" "dpkg suite" +.TH DPKG\-QUERY 1 "August 2001" "Debian Project" "dpkg suite" .SH NAME dpkg\-query \- a tool to query the dpkg database @@ -61,7 +61,7 @@ Display version information. Change the location of the \fBdpkg\fR database. The default location is \fI/var/lib/dpkg\fP. .TP -\fB\-\-showformat=\fP\fIformat\fR +\fB-f\fP | \fB\-\-showformat=\fP\fIformat\fR This option is used to specify the format of the output \fB\-\-show\fP will produce. The format is a string that will be output for each package listed. It can include the standard escape sequences \en (newline), \er diff --git a/scripts/dpkg-scanpackages.1 b/man/C/dpkg-scanpackages.1 similarity index 100% rename from scripts/dpkg-scanpackages.1 rename to man/C/dpkg-scanpackages.1 diff --git a/man/C/dpkg-scansources.1 b/man/C/dpkg-scansources.1 new file mode 100644 index 00000000..1f4921f2 --- /dev/null +++ b/man/C/dpkg-scansources.1 @@ -0,0 +1,56 @@ +.TH DPKG-SCANSOURCES 1 "2005-01-10" "Debian GNU/Linux" +.SH "NAME" +dpkg\-scansources \- search for '.dsc' files and build the 'Sources' index +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBdpkg-scansources\fR [switch]... \fIbinary-dir\fR [\fIoverride-file\fR +[\fIpath-prefix\fR]] > Sources +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBdpkg-scansources\fR scans the given \fIbinary-dir\fR for \fI.dsc\fR files. +These are used to create a Debian source index, which is output to +stdout. +.PP +The \fIoverride-file\fR, if given, is used to set priorities in the resulting +index records and to override the maintainer field given in the \fI.dsc\fR +files. See dpkg-scanpackages for the format of this file. \s-1NB:\s0 Since +the override file is indexed by binary, not source, packages, there's a bit +of a problem here. The current implementation uses the highest priority of +all the binary packages produced by a \fI.dsc\fR file for the priority of the +source package, and the override entry for the first binary package listed +in the \fI.dsc\fR file to modify maintainer information. This might change. +.PP +The \fIpath-prefix\fR, if given, is prepended to the directory field in the +generated source index. You generally use this to make the directory +fields contain the path from the top of the Debian archive hierarchy. +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fB\-\-debug\fR" 4 +.IX Item "--debug" +Turn debugging on. +.IP "\fB\-\-help\fR" 4 +.IX Item "--help" +Show the usage message and die. +.IP "\fB\-n\fR, \fB\-\-no\-sort\fR" 4 +.IX Item "-n, --no-sort" +Don't sort the index records. Normally they are sorted by source package +name. +.IP "\fB\-s\fR, \fB\-\-source\-override\fR \fIfile\fR" 4 +.IX Item "-s, --source-override file" +Use \fIfile\fR as the source override file. The default is the name of the +override file you specified with \fI.src\fR appended. +.Sp +The source override file is in a different format from the binary override +file. It contains only two whitespace separated fields, the first is the +source package name and the second is the section. Blank lines and comment +lines are ignored in the normal manner. If a package appears in both files +the source override takes precedence for setting the section. +.IP "\fB\-\-version\fR" 4 +.IX Item "--version" +Print the version number and exit. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIdpkg\-scanpackages\fR\|(1) +.SH "AUTHOR" +.IX Header "AUTHOR" +Roderick Schertler diff --git a/scripts/dpkg-source.1 b/man/C/dpkg-source.1 similarity index 99% rename from scripts/dpkg-source.1 rename to man/C/dpkg-source.1 index 782b05d2..4ad357f6 100644 --- a/scripts/dpkg-source.1 +++ b/man/C/dpkg-source.1 @@ -9,7 +9,7 @@ dpkg\-buildpackage, dpkg\-distaddfile, dpkg\-parsechangelog .BI "\-x " filename .dsc .br .B dpkg\-source \-b -.RI [ options "] " directory " [" orig-directory |''] +.RI [ options "] " directory " [" orig-directory | orig-targz |''] .br .B dpkg\-gencontrol .RI [ options ] diff --git a/split/dpkg-split.8 b/man/C/dpkg-split.1 similarity index 100% rename from split/dpkg-split.8 rename to man/C/dpkg-split.1 diff --git a/scripts/dpkg-statoverride.8 b/man/C/dpkg-statoverride.8 similarity index 100% rename from scripts/dpkg-statoverride.8 rename to man/C/dpkg-statoverride.8 diff --git a/main/dpkg.8 b/man/C/dpkg.1 similarity index 98% rename from main/dpkg.8 rename to man/C/dpkg.1 index 17466d34..685b0190 100644 --- a/main/dpkg.8 +++ b/man/C/dpkg.1 @@ -1,4 +1,4 @@ -.TH DPKG 8 "April 12, 1998" "Debian Project" "dpkg suite" +.TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite" .SH NAME dpkg - a medium-level package manager for Debian @@ -206,14 +206,7 @@ reason still haven't been installed. .TP .TP .B dpkg \-\-print\-architecture -Print target architecture (for example, "i386"). This option uses -\fBgcc\fP. -.TP -.B dpkg \-\-print\-gnu\-build\-architecture -Print GNU version of target architecture (for example, "i486"). -.TP -.B dpkg \-\-print\-installation\-architecture -Print host architecture for installation. +Print architecture of packages dpkg installs (for example, "i386"). .TP .B dpkg \-\-compare\-versions \fIver1 op ver2\fP Compare version numbers, where \fIop\fP is a binary operator. \fBdpkg\fP @@ -477,6 +470,9 @@ installed. \fB\-\-status\-fd \fP\fI\fP Send package status info to file descriptor \fI\fP. This can be given multiple times. Status updates are of the form `status: : '. +Errors are reported as `status: : error: extend-error-message'. +Configuration file conflicts are reported as +`status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited' .SH FILES .TP .I /etc/dpkg/dpkg.cfg diff --git a/man/en/dpkg.cfg.5 b/man/C/dpkg.cfg.5 similarity index 100% rename from man/en/dpkg.cfg.5 rename to man/C/dpkg.cfg.5 diff --git a/dselect/dselect.8 b/man/C/dselect.1 similarity index 99% rename from dselect/dselect.8 rename to man/C/dselect.1 index 5de7435c..32b10813 100644 --- a/dselect/dselect.8 +++ b/man/C/dselect.1 @@ -1,4 +1,4 @@ -.TH DSELECT 8 "July 2001" "Debian Project" "Debian" +.TH DSELECT 1 "July 2001" "Debian Project" "Debian" .SH NAME dselect \- Debian package management frontend .SH SYNOPSIS diff --git a/man/en/dselect.cfg.5 b/man/C/dselect.cfg.5 similarity index 100% rename from man/en/dselect.cfg.5 rename to man/C/dselect.cfg.5 diff --git a/scripts/install-info.8 b/man/C/install-info.8 similarity index 100% rename from scripts/install-info.8 rename to man/C/install-info.8 diff --git a/utils/md5sum.1 b/man/C/md5sum.1 similarity index 100% rename from utils/md5sum.1 rename to man/C/md5sum.1 diff --git a/utils/start-stop-daemon.8 b/man/C/start-stop-daemon.8 similarity index 100% rename from utils/start-stop-daemon.8 rename to man/C/start-stop-daemon.8 diff --git a/scripts/update-alternatives.8 b/man/C/update-alternatives.8 similarity index 100% rename from scripts/update-alternatives.8 rename to man/C/update-alternatives.8 diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 00000000..469df2ff --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = C de es fr ja pt_BR ru sv diff --git a/man/Makefile.in b/man/Makefile.in index c37efb63..07a9099b 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,32 +1,491 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -SUBDIRS = de en es fr ja pt_BR ru sv +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -default: all -include ../Makefile.conf +# 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. -clean: clean-recursive +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +SUBDIRS = C de es fr ja pt_BR ru sv +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (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. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + 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; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique -distclean: clean distclean-recursive - $(RM) Makefile +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here -install: install-doc +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -install-doc: install-doc-recursive - $(mkinstalldirs) $(DESTDIR)$(docdir) - set -e ; for i in ChangeLog THANKS TODO ; do \ - $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \ +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(INSTALL_DATA) $(top_srcdir)/COPYING $(DESTDIR)$(copyingfile) + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || mkdir "$(distdir)/$$subdir" \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="../$(top_distdir)" \ + distdir="../$(distdir)/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive -all-recursive install-recursive install-doc-recursive clean-recursive distclean-recursive: - set -e ; target=`echo $@ | $(SED) s/-recursive//`; \ - for s in $(SUBDIRS) ; do \ - $(MAKE) $(MFLAGS) -C $$s $$target ; \ - done; +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am html html-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 \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am -.PHONY: all clean distclean install install-doc -.PHONY: all-recursive clean-recursive distclean-recursive install-recursive -.PHONY: install-doc-recursive +# 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/man/de/Makefile.am b/man/de/Makefile.am new file mode 100644 index 00000000..62f15d0e --- /dev/null +++ b/man/de/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/de + +dist_man_MANS = \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 diff --git a/man/de/Makefile.in b/man/de/Makefile.in index 3b55b35b..36c02b16 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -1,36 +1,455 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -deman1dir = $(subst $(mandir),$(mandir)/de,$(man1dir)) -deman5dir = $(subst $(mandir),$(mandir)/de,$(man5dir)) -deman8dir = $(subst $(mandir),$(mandir)/de,$(man8dir)) +# 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. -MAN1PAGES = md5sum.1 -MAN8PAGES = start-stop-daemon.8 update-alternatives.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/de +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/de +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/de/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/de/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - rm -f Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(deman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(deman1dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(deman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(deman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man8 + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man8 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man8 -.PHONY: all clean distclean install install-doc +# 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/man/en/Makefile.in b/man/en/Makefile.in deleted file mode 100644 index 3bba3c5a..00000000 --- a/man/en/Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ - -default: all -include ../../Makefile.conf - -MAN5PAGES = deb-control.5 deb-old.5 deb.5 dpkg.cfg.5 dselect.cfg.5 - -all: - -clean: - -distclean: clean - $(RM) Makefile - -install: install-doc - -install-doc: - $(mkinstalldirs) $(DESTDIR)$(man5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(man5dir) ; \ - done - -.PHONY: all clean distclean install install-doc diff --git a/man/en/cleanup-info.8.sgml b/man/en/cleanup-info.8.sgml deleted file mode 100644 index ca5b7200..00000000 --- a/man/en/cleanup-info.8.sgml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - cleanup-info - 8 - Debian Project - dpkg suite - - - - cleanup-info - clean up the mess that install-info may have done - - - - - cleanup-info - --help - --unsafe - --version - -- - dirname - - - - - Description - - - cleanup-info is Perl script that tries to clean up the - mess that bogus install-info may have created. It gathers all sections - with the same heading into a single one. It tries to be smart about - cases and trailing colon/spaces. - - - - Other clean-ups include removing of empty sections, and squeezing the - blank lines (in entries part only). - - - - Order of sections is preserved (the first encountered section counts). - Order of entries within a section is preserved. - - - - - Please be extremely careful when using this - utility - it might not be 100% safe. cleanup-info - tries to be careful with your info dir file, but - only until it writes it. You should back the file up prior to using - this. - - - - - - Options - - - - - - --help - - - - - - Output the help screen and exit successfully. - - - - - - - - --unsafe - - - - - - Set some additional possibly useful options. - - - - - the option may garble an otherwise - correct file! - - - - - - - - - --version - - - - - - Output version and exit successfully. - - - - - - - - Files - - - - /usr/info/dir - <dirname>/dir - - - - The info directory file. The lock file is named the same, with - ".lock" suffix. - - - - - - - - See Also - - - - install-info - 8 - , - - - info - 1 - - - - - diff --git a/man/en/deb-control.5.sgml b/man/en/deb-control.5.sgml deleted file mode 100644 index 80a81791..00000000 --- a/man/en/deb-control.5.sgml +++ /dev/null @@ -1,426 +0,0 @@ - - - - - deb-control - 5 - Debian Project - dpkg utilities - - - - deb-control - Debian packages' master control file format - - - - control - - - - Description - - - Each Debian package contains the master control - file, which contains a number of fields. Each field begins with a tag, - such as Package or Version - (case insensitive), followed by a colon, and the body of the field. - Fields are delimited only by field tags. In other words, field text may - be multiple lines in length, but the installation tools will generally - join lines when processing the body of the field (except in the case of - the Description field, see below). - - - - - Required Fields - - - - - - Package: package_name - - - - - - The value of this field determines the package name, and is used to - generate file names by most installation tools. - - - - - - - - Version: version_string - - - - - - Typically, this is the original package's version number in - whatever form the program's author uses. It may also include a - Debian revision number (for non-native packages). If both version - and revision are supplied, they are seperated by a hyphen - (-. For this reason, the original version may not - have a hyphen in its version number. - - - - - - - - Maintainer: fullname email - - - - - - Should be in the format `Joe Bloggs <jbloggs@foo.com>', and - is typically the person who created the package, as opposed to the - author of the software that was packaged. - - - - - - - - Description: short description long description - - - - - - The format for the package description is a short brief summary on - the first line (after the "Description" field). The following lines - can be used as a longer, more detailed description. Each line of - the long description must be preceded by a space, and blank lines - in the long desription must contain a single '.' following the - preceding space. - - - - - - - - Optional Fields - - - - - - Section: section - - - - - - This is a general field that gives the package a category based on - the software that it installs. Some common sections are `utils', - `net', `mail', `text', `x11' etc. - - - - - - - - Priority: priority - - - - - - Sets the importance of this package in relation to the system as a - whole. Common priorities are `required', `standard', `optional', - `extra' etc. - - - - - - - In Debian, the Section and - Priority fields have a defined set of accepted - values based on the Policy Manual. They are used to decide how the - packages are layed out in the archive. A list of these can be - obtained from the latest version of - debian-policy package. - - - - - - - Essential: - - yes - no - - - - - - - - This field is usually only needed when the answer is `yes'. It - denotes a package that is required for proper operation of the - system. dpkg or any other installation tool will - not allow an Essential package to be removed - (at least not without using one of the force options). - - - - - - - - Architecture: - - <arch> - all - - - - - - - - The architecture specifies which type of hardware this package was - compiled for. Common architectures are `i386', `m68k', `sparc', - `alpha', `powerpc' etc. Note that the all - option is meant for packages that are architecture independent. - Some examples of this are shell or python scripts, or - documentation. - - - - - - - - Source: source_name - - - - - - The name of the source package that this binary package came from, - if different than the name of the package itself. - - - - - - - - Depends: package - - - - - - List of packages that are required for this package to provide a - non-trivial amount of functionality. The package maintenance - software will not allow a package to be installed if the packages - listed in its Depends field are not installed - (at least not without using the force options), and will run the - postinst scripts of packages listed in Depends: fields before those - of the packages which depend on them, and run prerm scripts before. - - - - - - - - Pre-Depends: package - - - - - - List of packages that must be installed and - configured before this one can be installed. This is usually used - in the case where this package requires another package for running - its preinst script. - - - - - - - - Recommends: package - - - - - - Lists packages that would be found together with this one in all - but unusual installations. The package maintenance software will - warn the user if they install a package without those listed in its - Recommends field. - - - - - - - - Suggests: package - - - - - - Lists packages that are related to this one and can perhaps enhance - its usefulness, but without which installing this package is - perfectly reasonable. - - - - - - - The syntax of Depends, - Pre-Depends, Recommends and - Suggests fields is a list of groups of alternative - packages. Each group is a list of packages separated by vertical bar (or - pipe) symbols, `|'. The groups are - separated by commas. Commas are to be read as `AND', and pipes as `OR', - with pipes binding more tightly. Each item is a package name optionally - followed by a version number specification in parentheses. - - - - A version number may start with a `>>', in which case any later - version will match, and may specify or omit the Debian packaging revision - (separated by a hyphen). Accepted version relationships are ">>" - for greater than, "<<" for less than, ">=" for greater than or - equal to, "<=" for less than or equal to, and "=" for equal to. - - - - - - - Conflicts: package - - - - - - Lists packages that conflict with this one, for example by - containing files with the same names. The package maintenance - software will not allow conflicting packages to be installed at the - same time. Two conflicting packages should each include a - Conflicts line mentioning the other. - - - - - - - - Replaces: package - - - - - - List of packages files from which this one replaces. This is used - for allowing this package to overwrite the files of another package - and is usually used with the Conflicts field - to force removal of the other package, if this one also has the - same files as the conflicted package. - - - - - - - - Provides: package - - - - - - This is a list of virtual packages that this one provides. Usuaully - this is used in the case of several packages all providing the same - service. For example, sendmail and exim can can serve as a mail - server, so they provide a common package (`mail-transport-agent') - on which other packages can depend. This will allow sendmail or - exim to serve as a valid option to satisy the dependency. This - prevents the packages that depend on a mail server from having to - know the package names for all of them, and using `|' to separate - the list. - - - - - - - The syntax of Conflicts, - Replaces and Provides is a list - of package names, separated by commas (and optional whitespace). In the - Conflicts field, the comma should be read as `OR'. - An optional version can also be given with the same syntax as above for - the Conflicts and Replaces - fields. - - - - Example - - -Package: grep -Essential: yes -Priority: required -Section: base -Maintainer: Wichert Akkerman <wakkerma@debian.org> -Architecture: sparc -Version: 2.4-1 -Pre-Depends: libc6 (>= 2.0.105) -Provides: rgrep -Conflicts: rgrep -Description: GNU grep, egrep and fgrep. - The GNU family of grep utilities may be the "fastest grep in the west". - GNU grep is based on a fast lazy-state deterministic matcher (about - twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper - search for a fixed string that eliminates impossible text from being - considered by the full regexp matcher without necessarily having to - look at every character. The result is typically many times faster - than Unix grep or egrep. (Regular expressions containing backreferencing - will run more slowly, however.) - - - - - See Also - - - - deb - 5 - , - - - dpkg - 8 - , - - - dpkg-deb - 1 - - - - - diff --git a/man/en/deb-old.5.sgml b/man/en/deb-old.5.sgml deleted file mode 100644 index 6b68cc89..00000000 --- a/man/en/deb-old.5.sgml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - deb-old - 5 - Debian Project - dpkg suite - - - - deb-old - old style Debian binary package format - - - - filename.deb - - - - Description - - - The .deb format is the Debian binary package file - format. This manual page describes the old format, - used before Debian 0.93. Please see - deb5 - for details of the new format. - - - - - Format - - - The file is two lines of format information as ASCII text, followed by - two concatenated gzipped ustar files. - - - - The first line is the format version number padded to 8 digits, and is - 0.939000 for all old-format archives. - - - - The second line is a decimal string (without leading zeroes) giving the - length of the first gzipped tarfile. - - - - Each of these lines is terminated with a single newline character. - - - - The first tarfile contains the control information, as a series of - ordinary files, described in the Debian Packaging Manual. The file - control must be present, as it contains the core - control information. - - - - In some very old archives, the files in the control tarfile may - optionally be in a DEBIAN subdirectory. In that - case, the DEBIAN subdirectory will be in the control - tarfile too, and the control tarfile will have only files in that - directory. Optionally the control tarfile may contain an entry for - `.', that is, the current directory. - - - - The second gzipped tarfile is the filesystem archive, containing - pathnames relative to the root directory of the system to be installed - on. The pathnames do not have leading slashes. - - - - - See Also - - - - deb - 5 - , - - - dpkg-deb - 1 - , - - - deb-control - 5 - , - - Debian Packaging Manual - - - - diff --git a/man/en/deb.5.sgml b/man/en/deb.5.sgml deleted file mode 100644 index 11ea7625..00000000 --- a/man/en/deb.5.sgml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - deb - 5 - Debian Project - dpkg suite - - - - deb - Debian binary package format - - - - filename.deb - - - - Description - - - The .deb format is the Debian binary package file - format. It is understood by dpkg 0.93.76 and - later, and is generated by default by all versions of - dpkg since 1.2.0 and all i386/ELF versions - since 1.1.1elf. - - - - The format described here is used since Debian 0.93; details of the old - format are described in - deb-old5. - - - - - Format - - - The file is an ar archive with a magic number of - !<arch>. - - - - The first member is named debian-binary and contains - a series of lines, separated by newlines. Currently only one line is - present, the format version number, 2.0 at the time - this manual page was written. Programs which read new-format archives - should be prepared for the minor number to be increased and new lines to - be present, and should ignore these if this is the case. - - - - If the major number has changed, an incompatible change has been made and - the program should stop. If it has not, then the program should be able - to safely continue, unless it encounters an unexpected member in the - archive (except at the end), as described below. - - - - The second required member is named control.tar.gz. - It is a gzipped tar archive containing the package control information, - as a series of plain files, of which the file - control is mandatory and contains the core control - information. Please see the Debian Packaging Manual, - section 2.2 for details of these files. The control tarball - may optionally contain an entry for `.', the current - directory. - - - - The third, last required member is named - data.tar.gz. It contains the filesystem archive as a - gzipped tar archive. - - - - These members must occur in this exact order. Current implementations - should ignore any additional members after - data.tar.gz. Further members may be defined in the - future, and (if possible) will be placed after these three. Any - additional members that may need to be inserted before - data.tar.gz and which should be safely ignored by - older programs, will have names starting with an underscore. - - - - Those new members which won't be able to be safely ignored will be - inserted before data.tar.gz with names starting with - something other than underscores, or will (more likely) cause the major - version number to be increased. - - - - - See Also - - - - deb-old - 5 - , - - - dpkg-deb - 1 - , - - - deb-control - 5 - , - - Debian Packaging Manual - - - - diff --git a/man/en/dpkg-checkbuilddeps.1.sgml b/man/en/dpkg-checkbuilddeps.1.sgml deleted file mode 100644 index 59324e0a..00000000 --- a/man/en/dpkg-checkbuilddeps.1.sgml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - dpkg-checkbuilddeps - 1 - Debian project - dpkg suite - - - - dpkg-checkbuilddeps - check build dependencies and conflicts - - - - - dpkg-checkbuilddeps - -B - control-file - - - - - Description - - - This program checks the installed packages in the system against the - build dependencies and build conflicts listed in the control file. It - also checks for build-essential. If any are not met, it displays them and - exits with a nonzero return code. - - - - By default, debian/control is read, but an alternate - control filename may be specified on the command line. - - - - - Options - - - - - - -B - - - - - - Ignore Build-Depends-Indep lines. Use when no arch-indep packages - will be built. - - - - - - - diff --git a/man/en/dpkg.8.sgml b/man/en/dpkg.8.sgml deleted file mode 100644 index a7e0036b..00000000 --- a/man/en/dpkg.8.sgml +++ /dev/null @@ -1,1532 +0,0 @@ - - - - - dpkg - 8 - Debian Project - dpkg suite - - - - dpkg - a medium-level package manager for Debian - - - - - - dpkg - options - action - - - - - Warning - - - This manual is intended for users wishing to understand - dpkg's command line options and package states in - more detail than that provided by dpkg --help. - - - - It should not be used by package maintainers - wishing to understand how dpkg will install their - packages. The descriptions of what dpkg does when - installing and removing packages are particularly inadequate. - - - - - - Description - - - dpkg is a medium-level tool to install, build, remove - and manage Debian packages. The primary and more user-friendly front-end - for dpkg is dselect (see - dselect - 8). dpkg itself - is controlled entirely via command line parameters, which consist of - exactly one action and zero or more options. The action-parameter tells - dpkg what to do and options control the behavior of - the action in some way. - - - - dpkg can be also be used as a front-end to - dpkg-deb. The following are - dpkg-deb actions, and if they are encountered, - dpkg just runs dpkg-deb with the - parameters given to it: - - - , - , - , - , - , - , - , - - - - - - Please refer to - dpkg-deb - 1 for information about these - actions. - - - - - Information About Packages - - - dpkg maintains some usable information about available - packages. The information is divided in three classes: states, - selection states and flags. These values are intended to - be changed mainly with dselect. - - - - Package States - - - - installed - - The package is unpacked and configured OK. - - - - - half-installed - - The installation of the package has been started, but not completed - for some reason. - - - - - not-installed - - The package is not installed on your system. - - - - - unpacked - - The package is unpacked, but not configured. - - - - - half-configured - - The package is unpacked and configuration has been started, but not - yet completed for some reason. - - - - - config-files - - Only the configuration files of the package exist on the system. - - - - - - - - Package Selection States - - - - install - - The package is selected for installation. - - - - - deinstall - - The package is selected for deinstallation (i.e. we want to remove - all files, except configuration files). - - - - - purge - - The package is selected to be purged (i.e. we want to remove - everything, even configuration files). - - - - - - - Package Flags - - - - hold - - A package marked to be on hold is not handled by - dpkg, unless forced to do that with option - . - - - - - reinst-required - - A package marked reinst-required is broken and requires - reinstallation. These packages cannot be removed, unless forced - with option . - - - - - - - - Actions - - - - - - dpkg - - - -i - --install - - package_file - - - - - - - Install the package. If or - option is specified, - package file must refer to a directory - instead. - - - - Installation consists of the following steps: - - - - - Extract the control files of the new package. - - - - If another version of the same package was installed before - the new installation, execute prerm script - of the old package. - - - - Run the preinst script, if provided by the - package. - - - - Unpack the new files, and at the same time back up the old files, - so that if something goes wrong, they can be restored. - - - - If another version of the same package was installed before - the new installation, execute the postrm - script of the old package. Note that this script is executed - after the preinst script of the new package, - because new files are written at the same time old files are - removed. - - - - Configure the package. See for - detailed information about how this is done. - - - - - - - - - dpkg - --unpack package_file - - - - - - Unpack the package, but don't configure it. If - or option is - specified, package_file must refer - to a directory instead. - - - - - - - - dpkg - --configure - - --pending - -a - package - - - - - - - - Reconfigure an unpacked package. If or - is given instead of - package, all unpacked but unconfigured - packages are configured. - - - - Configuring consists of the following steps: - - - - - Unpack the configuration files, and at the same time back up the - old configuration files, so that they can be restored if - something goes wrong. - - - - Run postinst script, if provided by the - package. - - - - - - - - - dpkg - - - -r - --remove - -P - --purge - - - --pending - -a - package - - - - - - - - Remove an installed package. or - remove everything except configuration - files. This may avoid having to reconfigure the package if it is - reinstalled later. (Configuration files are the files listed in the - debian/conffiles control file). - or removes everything, - including configuration files. - - - - If or is given - instead of a package name, then all packages unpacked, but - marked to be removed or purged in file - /var/lib/dpkg/status, are removed or purged, - respectively. - - - - Removing of a package consists of the following steps: - - - - - Run prerm script. - - - - Remove the installed files. - - - - Run postrm script. - - - - - - - - - dpkg - - - -p - --print-avail - - package - - - - - - Display details about , as found in - /var/lib/dpkg/available. - - - - - - - dpkg - - - --update-avail - --merge-avail - - Packages file - - - - - - Update dpkg's and dselect's - idea of which packages are available. With action - , old information is combined with - information from . With action - , old information is replaced with the - information in the . The - Packages-file distributed with Debian is simply - named Packages. dpkg keeps - its record of available packages in - /var/lib/dpkg/available. - - - A simpler one-shot command to retrieve and update the - available file is - dselect update. - - - - - - - dpkg - - - -A - --record-avail - - package file - - - - - - Update dpkg and dselect's idea - of which packages are available with information from the package - package file. If or - option is specified, - package file must refer to a directory - instead. - - - - - - - dpkg - --forget-old-unavail - - - - - Forget about uninstalled unavailable packages. - - - - - - - dpkg - --clear-avail - - - - - Erase the existing information about what packages are - available. - - - - - - - dpkg - - - -l - --list - - package-name-pattern - - - - - - List packages matching given pattern. If no - is given, list all packages - in /var/lib/dpkg/available. Normal shell - wildchars are allowed. (You will probably have to quote - to prevent the shell - from performing filename expansion. For example, - dpkg -l 'libc5*' will list all the package - names starting with "libc5".) - - - - - - - dpkg - - - -s - --status - - package-name - - - - - - Report status of specified package. This just displays the entry in - the installed package status database. - - - - - - - dpkg - - - -C - --audit - - - - - - - Searches for packages that have been installed only partially on your - system. dpkg will suggest what to do with them to - get them working. - - - - - - - dpkg - --get-selections pattern - - - - - Get list of package selections, and write it to stdout. - - - - - - - dpkg - --set-selections - - - - - Set package selections using file read from stdin. - - - - - - - dpkg - --yet-to-unpack - - - - - Searches for packages selected for installation, but which for some - reason still haven't been installed. - - - - - - - dpkg - - - -L - --listfiles - - package - - - - - - List files installed to your system from . - However, note that files created by package-specific - installation-scripts are not listed. - - - - - - - dpkg - - - -S - --search - - filename_search_pattern - - - - - - Search for a filename from installed packages. All standard shell - wildchars can be used in the pattern. - - - - - - - dpkg - --print-architecture - - - - - Print target architecture (for example, "i386"). This option uses - gcc. - - - - - - - dpkg - --print-gnu-build-architecture - - - - - Print GNU version of target architecture (for example, "i486"). - - - - - - - dpkg - --print-installation-architecture - - - - - Print host architecture for installation. - - - - - - - dpkg - --compare-versions - ver1 - op - ver2 - - - - - - Compare version numbers, where is a binary - operator. dpkg returns success (zero result) if - the specified condition is satisfied, and failure (nonzero result) - otherwise. There are two groups of operators, which differ in how - they treat an empty or . - These treat an empty version as earlier than any version: - lt le eq ne ge gt. These treat an empty version - as later than any version: - lt-nl le-nl ge-nl gt-nl. - These are provided only for compatibility with - control file syntax: < << - <= = >= >> >. - - - - - - - dpkg - --command-fd <n> - - - - - Accept a series of commands on input file descriptor - . Note: additional options set on the - command line, and thru this file descriptor, are not reset for - subsequent commands executed during the same run. - - - - - - - dpkg - --help - - - - - Display a brief help message. - - - - - - - dpkg - --force-help - - - - - Give help about the - options. - - - - - - - dpkg - - - -Dh - --debug=help> - - - - - - - Give help about debugging options. - - - - - - - dpkg - - - --licence - --license - - - - - - - Display dpkg licence. - - - - - - - dpkg - --version - - - - - Display dpkg version information. - - - - - - dpkg-deb actions - - - - See dpkg-deb - 1 for more information - about the low-level actions. - - - - - - - Options - - - All options can be specified both on the commandline and in the - dpkg configuration file - /etc/dpkg/dpkg.cfg. Each line in the configuration - file is either an option (exactly the same as the commandline option - but without leading dashes) or a comment (if it starts with a - hash (`#') sign). - - - - - - - --abort-after=number - - - - - Change after how many errors dpkg will abort. - The default is 50. - - - - - - - - -B - --auto-deconfigure - - - - - - When a package is removed, there is a possibility that another - installed package depended on the removed package. Specifying this - option will cause automatic deconfiguration of the package which - depended on the removed package. - - - - - - - - -Doctal - --debug=octal - - - - - - - Set debugging on. is formed by - bitwise-orring desired values together from the list below (note - that these values may change in future releases). The - or options - display these debugging values. - - - - Debug flags - - - - number - description - - - - - - 1 - Generally helpful progress information - - - 2 - Invocation and status of maintainer scripts - - - 10 - Output for each file processed - - - 100 - Lots of output for each file processed - - - 20 - Output for each configuration file - - - 200 - Lots of output for each configuration file - - - 40 - Dependencies and conflicts - - - 400 - Lots of dependencies/conflicts output - - - 1000 - Lots of drivel about e.g. the dpkg/info dir - - - 2000 - Insane amounts of drivel - - - -
- - - - - - - - --force-things - --no-force-things - --refuse-things - - - - - - - Force or refuse ( and - mean the same thing) to do - some things. is a comma separated list - of things specified below. - displays a message describing them. Things marked with - (*) are forced by default. - - - - - Warning: These options are mostly intended to be used - by experts only. Using them without fully understanding their - effects may break your whole system. - - - - - - all - - - Turns on(or off) all force options. - - - - - auto-select (*) - - - Select packages to install them, and deselect packages to - remove them. - - - - - downgrade (*) - - - Install a package, even if newer version of it is already - installed. - - - - - configure-any - - - Configure also any unpacked but unconfigured packages on - which the current package depends. - - - - - hold - - - Process packages even when marked "hold". - - - - - remove-reinstreq - - - Remove a package, even if it's broken and marked to require - reinstallation. This may, for example, cause parts of the - package to remain on the system, which will then be forgotten - by dpkg. - - - - - remove-essential - - - Remove, even if the package is considered essential. - Essential packages contain mostly very basic Unix commands. - Removing them might cause the whole system to stop working, - so use with caution. - - - - - depends - - - Turn all dependency problems into warnings. - - - - - depends-version - - - Don't care about versions when checking dependencies. - - - - - conflicts - - - Install, even if it conflicts with another package. This is - dangerous, for it will usually cause overwriting of some - files. - - - - - confmiss - - - Always install a missing configuration file. This is dangerous, - since it means not preserving a change (removing) made to the - file. - - - - - confnew - - - If a conffile has been modified always install the new - version without prompting, unless the - is also specified, in - which case the default action is preferred. - - - - - confold - - - If a conffile has been modified always keep the old version - without prompting, unless the - is also specified, in which case the default action is - preferred. - - - - - confdef - - - If a conffile has been modified always choose the default - action. If there is no default action it will stop to ask the - user unless or - is also been given, in which - case it will use that to decide the final action. - - - - - overwrite - - - Overwrite one package's file with another's file. - - - - - overwrite-dir - - - Overwrite one package's directory with another's file. - - - - - overwrite-diverted - - - Overwrite a diverted file with an undiverted version. - - - - - architecture - - - Process even packages with the wrong architecture. - - - - - bad-path - - - PATH is missing important programs, so - problems are likely. - - - - - bad-verify - - - Install a package even if debsig - verification fails. This can be a security - risk. - - - - - not-root - - - Try to (de)install things even when not root. - - - - - - - - - - --ignore-depends=package, - - - - - Ignore dependency-checking for specified packages (actually, - checking is performed, but only warnings about conflicts are given, - nothing else). - - - - - - - - --new - --old - - - - - - Select new or old binary package format. This is a - dpkg-deb1 - option. - - - - - - - --nocheck - - - - - Don't read or check contents of control file - while building a package. This is a - dpkg-deb1 - option. - - - - - - - --no-act - - - - - - Do everything which is supposed to be done, but don't write any - changes. This is used to see what would happen with the specified - action, without actually modifying anything. - - - - Be sure to give before the - action-parameter, or you might end up with undesirable results. - (e.g. dpkg --purge foo --no-act will first - purge package foo and then try to purge - package --no-act, even though you probably expected it to - actually do nothing) - - - - - - - - - -R - --recursive - - - - - - Recursively handle all regular files matching pattern - *.deb found at specified directories and all - of its subdirectories. This can be used with , - , , - and - actions. - - - - - - - -G - - - - - Do not install a package if a newer version of the same package is - already installed. This is an alias of - . - - - - - - - - --root=dir - --admindir=dir - --instdir=dir - - - - - - Change default directories. defaults to - /var/lib/dpkg and contains many files that - give information about status of installed or uninstalled packages, - etc. defaults to / - and refers to the directory where packages are to be installed. - is also the directory passed to - chroot2 - before running package's installation scripts, which means that the - scripts see as a root directory. - Changing changes to - and to - /var/lib/dpkg. - - - - - - - - -O - --selected-only - - - - - - Only process the packages that are selected for installation. The - actual marking is done with dselect or by - dpkg, when it handles packages. For example, - when a package is removed, it will be marked selected for - installation. - - - - - - - - -E - --skip-same-version - - - - - - Do not install the package if the same version of the package is - already installed. - - - - - - - --status-fd <n> - - - - - Send package status info to file descriptor - . This can be given multiple times. - Status updates are of the form - `status: <pkg>: <pkg qstate>' - - - - - - - Files - - - - /etc/dpkg/dpkg.cfg - - - Configuration file with default options. - - - - - - There files are stored in the dpkg database directory - (which defaults to /var/lib/dpkg). You can - override the location with the option. - - - - - /var/lib/dpkg/available - - - List of available packages. - - - - - /var/lib/dpkg/status - - - Statuses of available packages. This file contains information about - whether a package is marked for removing or not, whether it is - installed or not, etc. - - - - - - - Environment variables - - - - DPKG_NO_TSTP - - - Define this to something if you prefer dpkg - starting a new shell rather than suspending itself, while doing a - shell escape. - - - - - SHELL - - - The program dpkg will execute while starting a new - shell. - - - - - COLUMNS - - - Sets the number of columns dpkg should use when - displaying formatted text. Currently only used by - . - - - - - DPKG_OLD_CONFFILE - - - Set by dpkg to the filename of the old - configuration file when you start a shell to examine a changed - configuration file. - - - - - DPKG_NEW_CONFFILE - - - Set by dpkg to the filename of the newversion of a - configuration file when you start a shell to examine a changed - configuration file. - - - - - - - Examples - - - To list packages related to the editor vi: - - dpkg '*vi*' - - - - To see the entries in /var/lib/dpkg/available on two - packages - - dpkg elvis vim - - - - To search the listing of packages yourself: - - less /var/lib/dpkg/available - - - - To remove an installed emacs package: - - dpkg emacs - - - - To make a local copy of the package selection states: - - dpkg > myselections - - - - You might transfer this file to another computer, and install it there - with: - - dpkg < myselections - - Note that this will not actually install or remove anything, but just - set the selection state on the requested packages. You will need some - other application to actually download and install the requested - packages. - - - - Ordinarily, you will find that - dselect8 - provides a more convenient way to modify the package selection - states. - - - - - Additional Functionality - - Additional functionality can be gained by installing any of the - following packages: apt, - aptitude and debsums. - - - - - See Also - - - - dselect - 8 - , - - - dpkg-deb - 1 - , - - - deb - 5 - , - - - deb-control - 5 - - - - dpkg-reconfigure - 8 - - - - - - diff --git a/man/en/dpkg.cfg.5.sgml b/man/en/dpkg.cfg.5.sgml deleted file mode 100644 index b719e7d8..00000000 --- a/man/en/dpkg.cfg.5.sgml +++ /dev/null @@ -1,68 +0,0 @@ - -%paths -]> - - - - dpkg.cfg - 5 - Debian Project - dpkg suite - - - - dpkg.cfg - dpkg configuration file - - - - Description - - - This file contains default options for dpkg. Each line - contains a single option which is exactly the same as a normal - commandline option for dpkg except for the leading dashes which are not - used here. Comments are allowed by starting a line with a hash sign - (#). - - - - - Files - - - - &dpkgconfdir;/dpkg.cfg - - - - System-wide configuration file. - - - - - - ~/.dpkg.cfg - - - - User configuration file. - - - - - - - - See Also - - - - dpkg - 8 - - - - - diff --git a/man/en/dselect.8.sgml b/man/en/dselect.8.sgml deleted file mode 100644 index e2f6a561..00000000 --- a/man/en/dselect.8.sgml +++ /dev/null @@ -1,1094 +0,0 @@ - - - - - dselect - 8 - Debian Project - dpkg suite - - - - dselect - Debian package management frontend - - - - - dselect - --admindir directory - --help - --version - - --licence - --license - - --expert - - - --debug - -D - - file - - - - - --colour - --color - - screenpart:foreground,background:attr+attr+.. - - action - - - - - Description - - - dselect is the primary user interface for managing - packages on a Debian system. At the dselect main menu, - the system administrator can: - - - - - - Update the list of available package versions - - - - - - View the status of installed and available packages, - - - - - - Alter package selections and manage dependencies, - - - - - - Install new packages or upgrade to newer versions. - - - - - - - dselect operates as a front-end to - >dpkg, the medium-level debian package handling tool. - It features a full-screen package selections manager with package depends - and conflicts resolver. When run with adminitrator priviledges, packages - can be installed, upgraded and removed. Various access methods can be - configured to retrieve available package version information and - installable packages from package repositories. Depending on the used - access method, these repositories can be public archive servers on the - internet, local archive servers or cdroms. The recommended access method - is apt, which is provided by the package - apt. - - - - Normally dselect is invoked without parameters. An - interactive menu is presented, offering the user a list of actions. If - an action is given as argument, then that action is started immediately. - Several commandline parameters are still available to modify the running - behaviour of dselect or show additional information - about the program. - - - - - Options - - - All options can be specified both on the commandline and in the - dselect configuration file - /etc/dpkg/dselect.cfg. Each line in the - configuration file is either an option (exactly the same as the - commandline option but without leading dashes) or a comment (if it starts - with a hash `#' sign). - - - - - - - --admindir directory - - - - - - Changes the directory where the dpkg status, - available and similar files are located. This - defaults to /var/lib/dpkg and normally there - should not be any need to change it. - - - - - - - - - --debug file - -D file - - - - - - - Turn on debugging. Debugging information is sent to - . - - - - - - - - --expert - - - - - - Turns on expert mode, i.e. does not display possibly annoying - help messages. - - - - - - - - - - --colour - --color - - screenpart:foreground,background:attr+attr+.. - - - - - - - Configures screen colours. This works only if your display - supports colours. This option may be used multiple times (and is - best used in dselect.cfg). Each use changes - the colour (and optionally, other attributes) of one part of the - screen. The parts of the screen (from top to bottom) are: - - - - - title - - - - The screen title. - - - - - - listhead - - - - The header line above the list of packages. - - - - - - list - - - - The scrolling list of packages (and also some help text). - - - - - - listsel - - - - The selected item in the list. - - - - - - pkgstate - - - - In the list of packages, the text indicating the current - state of each package. - - - - - - pkgstatesel - - - - In the list of packages, the text indicating the current - state of the currently selected package. - - - - - - infohead - - - - The header line that displays the state of the currently - selected package. - - - - - - infodesc - - - - The package's short description. - - - - - - info - - - - Used to display package info such as the package's description. - - - - - - infofoot - - - - The last line of the screen when selecting packages. - - - - - - query - - - - Used to display query lines. - - - - - - helpscreen - - - - Colour of help screens. - - - - - - - After the part of the screen comes a colon and the color - specification. You can specify either the foreground color, the - background color, or both, overriding the compiled-in colors. Use - standard curses color names. - - - - Optionally, after the color specification is another colon, and - an attribute specification. This is a list of one or more - attributes, separated by plus ("+") characters. Available - attributes include (not all of these will work on all terminals): - normal, standout, underline, reverse, blink, bright, dim, - bold. - - - - - - - - --help - - - - - - Print a brief help text and exit successfully. - - - - - - - - - --licence - --license - - - - - - - Displays the dselect copyright and license - information and exits successfully. - - - - - - - - --version - - - - - - Print version information and exit successfully. - - - - - - - - Usage - - - When dselect is started interactively, it prompts the - user with a menu of available actions: - - - - - Access - - - - Choose and configure an access method to access package repositories. - - - - By default, dselect provides several methods such - as floppy, harddisk or - cdrom, but other packages may provide additional - methods, eg. the apt access method provided by - the apt package or - multi_cd by the - dpkg-multicd package. - - - - - The use of the apt access method is strongly - recommended. - - - - - - - Update - - - - Refresh the available packages database. - - - - Retrieves a list of available package versions from the package - repository, configured for the current access method, and update - the dpkg database. The package lists are commonly provided by the - repository as files named Packages or - Packages.gz. These files can be generated by - repository maintainers, using the program - dpkg-scanpackages. - - - - Details of the update action depend on the access method's - implementation. Normally the process is straightforward and - requires no user interaction. - - - - - - Select - - - - View or manage package selections and dependencies. - - - - This is the main function of dselect. In the - select screen, the user can review a list of all available and - installed packages. When run with administrator privileges, it is - also possible to interactively change packages selection state. - dselect tracks the implications of these changes - to other depending or conflicting packages. - - - - When a conflict or failed depends is detected, a dependency - resolution subscreen is prompted to the user. In this screen, a - list of conflicting or depending packages is shown, and for each - package listed, the reason for its listing is shown. The user may - apply the suggestions proposed by dselect, - override them, or back out all the changes, including the ones that - created the unresolved depends or conflicts. - - - - The use of the interactive package selections management screen is - explained in more detail below. - - - - - - Install - - - - Installs selected packages. - - - - The configured access method will fetch installable or upgradable - packages from the relevant repositories and install these using - dpkg. Depending on the implementation of the - access method, all packages can be prefetched before installation, - or fetched when needed. Some access methods may also remove - packages that were marked for removal. - - - - If an error occurred during install, it is usually advisable to run - install again. In most cases, the problems will disappear or be - solved. If problems persist or the installation performed was - incorrect, please investigate into the causes and circumstances, - and file a bug in the Debian bug tracking system. Instructions on - how to do this can be found at http://bugs.debian.org/ or by - reading the documentation for bug or - reportbug, if these are installed. - - - - Details of the install action depend on the access method's - implementation. The user's attention and input may be required - during installation, configuration or removal of packages. This - depends on the maintainer scripts in the package. Some packages - make use of the >debconf library, - allowing for more flexible or even automated installation setups. - - - - - - Config - - - - Configures any previously installed, but not fully configured packages. - - - - - - Remove - - - - Removes or purges installed packages, that are marked for removal. - - - - - - Quit - - - - Quit dselect. - - - - Exits the program with zero (succesful) errorcode. - - - - - - - - Package Selections Management - - - Introduction - - - dselect directly exposes - the administrator to some of the complexities involved with managing - large sets of packages with many interdependencies. For a user who is - unfamiliar with the concepts and the ways of the debian package - management system, it can be quite overwhelming. Although dselect is aimed at easing package management and - administration, it is only instrumental in doing so and can not be - assumed to be a sufficient substitute for administrator skill and - understanding. The user is required to be familiar with the concepts - underlying the Debian packaging system. In case of doubt, consult the - dpkg8 - manpage and the Debian policy manual. - - - - Unless dselect is run in expert or immediate mode, a - help screen is first displayed when choosing this action from the menu. - The user is strongly advised to study all of the - information presented in the online help screens, when one pops up. - The online help screens can at any time be invoked with the - ? key. - - - - - Screen Layout - - - The select screen is by default split in a top and a bottom half. The - top half shows a list of packages. A cursor bar can select an - individual package, or a group of packages, if applicable, by selecting - the group header. The bottom half of the screen shows some details - about the package currently selected in the top half of the screen. - The type of detail that is displayed can be varied. - - - - Pressing the I key toggles a full-screen display of - the packages list, an enlarged view of the package details, or the - equally split screen. - - - - - Package Details View - - - The package details view by default shows the extended package - description for the package that is currently selected in the packages - status list. The type of detail can be toggled by pressing the - i key. This alternates between: - - - - - - the extended description - - - - - - the control information for the installed version - - - - - - the control information for the available version - - - - - - In a dependency resolution screen, there is also the possibility of - viewing the specific unresolved depends or conflicts related to the - package and causing it to be listed. - - - - - Packages Status List - - - The main select screen displays a list of all packages known to the - debian package management system. This includes packages installed on - the system and packages known from the available packages database. - - - - For every package, the list shows the package's status, priority, - section, installed and available versions, the package name and its - short description, all in one line. By pressing the V - key, the display of the installed and available version can be toggled - between on an off. By pressing the v key, the package - status display is toggled between verbose and shorthand. Shorthand - display is the default. - - - - The shorthand status indication consists of four parts: an error flag, - which should normally be clear, the current status, the last selection - state and the current selection state. The first two relate to the - actual state of the package, the second pair are about the selections - set by the user. - - - - These are the meanings of the shorthand package status indicator codes: - - - - Error flags - - - - Flag - Description - - - - - - empty - no error - - - R - serious error, needs reinstallation - - - -
- - - Installed state - - - - Flag - Description - - - - - - empty - not installed - - - * - fully installed and configured - - - - - not installed but some config files may remain - - - U - unpacked but not yet configured - - - C - half-configured (an error happened) - - - I - half-installed (an error happened) - - - -
- - - Current and requested selsections - - - - Flag - Description - - - - - - * - marked for installation or upgrade - - - - - marked for removal, configuration files remain - - - = - on hold: package will not be processed at all - - - _ - marked for purge, also remove configuration and data - - - n - package is new and has yet to be marked - - - -
- - - - Cursor And Screen Movement - - - The package selection list and the dependency conflict resolution - screens can be navigated using motion commands mapped to the following - keys: - - - - movement keybindings - - - - - Key(s) - Action - - - - - - p, Up, k - move cursor bar up - - - n, Down, j - move cursor bar down - - - P, PgUp, BackSpace - scroll list 1 page up - - - N, PgDn, Space - scroll list 1 page down - - - Ctrl-p - scroll list 1 line up - - - Ctrl-n - scroll list 1 line down - - - t, Home - jump to top of list - - - e, End - jump to end of list - - - u - scroll info 1 page up - - - d - scroll info 1 page down - - - Ctrl-u - scroll info 1 line up - - - Ctrl-d - scroll info 1 line down - - - B, Left - pan display 1/3 screen left - - - F, Right - pan display 1/3 screen right - - - Ctrl-b - pan display 1 character left - - - Ctrl-f - pan display 1 character right - - - -
- - - - Searching And Sorting - - - The list of packages can be searched by package name. This is done by - pressing /, and typing a simple search string. The - string is interpreted as a - regex7 - regular expression. If you add `/d' to the search - expression, dselect will also search in descriptions. If you add - `/i' the search will be case insensitive. You may - combine these two suffixes like this: `'/id'. - Repeated searching is accomplished by repeatedly pressing the - n or \ keys, until the wanted package - is found. If the search reaches the bottom of the list, it wraps to - the top and continues searching from there. - - - - The list sort order can be varied by pressing the o - and O keys repeatedly. The following nine sort - orderings can be selected: - - - - alphabet available status - priority+section available+priority status+priority - section+priority available+section status+section - - - - Where not listed above explicitly, alphabetic order is used as the - final subordering sort key. - - - - - Altering Selections - - - The requested selection state of individual packages may be altered - with the following commands: - - - - action keybindings - - - - - Key(s) - Action - - - - - - +, Insert - install or upgrade - - - =, H - hold in present state and version - - - :, G - unhold: upgrade or leave uninstalled - - - -, Delete - remove, but leave configuration and data - - - _ - remove & purge configuration and data - - - -
- - - When the change request results in one or more unsatisfied depends or - conflicts, dselect prompts the user with a - dependency resolution screen. This will be further explained below. - - - - It is also possible to apply these commands to groups of package - selections, by pointing the cursor bar onto a group header. The exact - grouping of packages is dependent on the current - list ordering settings. - - - - Proper care should be taken when altering large groups of selections, - because this can instantaneously create large numbers of unresolved - depends or conflicts, all of which will be listed in one dependency - resolution screen, making them very hard to handle. In practice, only - hold and unhold operations are useful when applied to groups. - - - - - Resolving Depends And Conflicts - - - When the change request results in one or more unsatisfied depends or - conflicts, dselect prompts the user with a - dependency resolution screen. First however, an informative help - screen is displayed. - - - - The top half of this screen lists all the packages that will have - unresolved depends or conflicts, as a result of the requested change, - and all the packages whose installation can resolve any of these - depends or whose removal can resolve any of the conflicts. The bottom - half defaults to show the depends or conflicts that cause the currently - selected package to be listed. - - - - When the sublist of packages is displayed initially, - dselect may have already set the requested selection - status of some of the listed packages, in order to resolve the depends - of conflicts that caused the dependency resolution screen to be - displayed. Usually, it is best to follow up the suggestions made by - dselect. - - - - The listed packages' selection state may be reverted to the original - settings, as they were before the unresolved depends or conflicts were - created, by pressing the R key. By pressing the - D key, the automatic suggestions are reset, but the - change that caused the dependency resolution screen to be prompted is - kept as requested. Finally, by pressing U, the - selections are again set to the automatic suggestion values. - - - - - Establishing The Requested Selections - - - By pressing Enter, the currently displayed set of - selections is accepted. If dselect detects no - unresolved depends as a result of the requested selections, the new - selections will be set. However, if there are any unresolveded - depends, dselect will again prompt the user with a - dependency resolution screen. - - - - To alter a set of selections that creates unresolved depends or - conflicts and forcing dselect to accept it, press - the Q key. This sets the selections as specified by - the user, unconditionally. Generally, don't do this unless you've read - the fine print. - - - - The opposite effect, to back out any selections change requests and go - back to the previous list of selections, is attained by pressing the - X or Escape keys. By repeatedly - pressing these keys, any possibly detrimental changes to the requested - package selections can be backed out completely to the last established - settings. - - - - - - Bugs - - - The dselect package selection interface is confusing - to some new users. Reportedly, it even makes seasoned kernel developers - cry. - - - - The documentation is lacking. - - - - There is no help option in the main menu. - - - - The visible list of available packages cannot be reduced. - - - - The built in access methods can no longer stand up to current quality - standards. Use the access method provided by - apt, it is not only not broken, it is also - much more flexible than the built in access methods. - - - - - See Also - - - - dselect.cfg - 5 - , - - - dpkg - 8 - , - - - apt-get - 8 - , - - - sources.list - 5 - , - - - deb - 5 - , - - the Debian policy manual. - - - - diff --git a/man/en/dselect.cfg.5.sgml b/man/en/dselect.cfg.5.sgml deleted file mode 100644 index 6aa0d633..00000000 --- a/man/en/dselect.cfg.5.sgml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - dselect.cfg - 5 - Debian Project - dpkg suite - - - - dselect.cfg - dselect configuration file - - - - Description - - - This file contains default options for dselect. Each - line contains a single option which is exactly the same as a normal - commandline option for dselect except for the leading dashes which are - not used here. Comments are allowed by starting a line with a hash sign - (#). - - - - - Files - - - - /etc/dpkg/dselect.cfg - - - - System-wide configuration file. - - - - - - /.dselect.cfg - - - - User configuration file. - - - - - - - - See Also - - - - dselec5t - 8 - - - - - diff --git a/man/es/Makefile.am b/man/es/Makefile.am new file mode 100644 index 00000000..2570d5a1 --- /dev/null +++ b/man/es/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/es + +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dselect.1 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 02b96fcb..057e1ee8 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -1,49 +1,517 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -esman1dir = $(subst $(mandir),$(mandir)/es,$(man1dir)) -esman5dir = $(subst $(mandir),$(mandir)/es,$(man5dir)) -esman8dir = $(subst $(mandir),$(mandir)/es,$(man8dir)) +# 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. -MAN1PAGES = dpkg-deb.1 dpkg-name.1 md5sum.1 dpkg-checkbuilddeps.1 \ - 822-date.1 dpkg-source.1 dpkg-scanpackages.1 \ - dpkg-scansources.1 -MAN5PAGES = deb-control.5 deb.5 -MAN8PAGES = cleanup-info.8 dpkg.8 dpkg-divert.8 start-stop-daemon.8 \ - dselect.8 update-alternatives.8 dpkg-statoverride.8 \ - dpkg-split.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/es +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/es +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dselect.1 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/es/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/es/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: -install-program: +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(esman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(esman1dir) ; \ - done - $(mkinstalldirs) $(DESTDIR)$(esman5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(esman5dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(esman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(esman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: all clean distclean install install-doc install-program +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +# 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/man/es/dpkg-split.8 b/man/es/dpkg-split.1 similarity index 100% rename from man/es/dpkg-split.8 rename to man/es/dpkg-split.1 diff --git a/man/es/dpkg.8 b/man/es/dpkg.1 similarity index 99% rename from man/es/dpkg.8 rename to man/es/dpkg.1 index 4450ed90..4299fe8e 100644 --- a/man/es/dpkg.8 +++ b/man/es/dpkg.1 @@ -4,7 +4,7 @@ .\" Está basada en la página de manual original: .\" versión 1.4 del CVS de /cvs/debian-doc/manpages/english/dpkg/dpkg.8 -.TH DPKG 8 "Febrero 2000" "Proyecto Debian" "herramientas dpkg" +.TH DPKG 1 "Febrero 2000" "Proyecto Debian" "herramientas dpkg" .SH NOMBRE dpkg \- Gestor de paquetes Debian de medio nivel .. diff --git a/man/es/dselect.8 b/man/es/dselect.1 similarity index 99% rename from man/es/dselect.8 rename to man/es/dselect.1 index 1d79c578..e7ebb5ac 100644 --- a/man/es/dselect.8 +++ b/man/es/dselect.1 @@ -5,7 +5,7 @@ .\" Está basada en la página de manual original: .\" versión 1.3 del CVS de /cvs/debian-doc/manpages/english/dpkg/dselect.8 -.TH "DSELECT" "8" "Julio de 2001" "Proyecto Debian" "Debian GNU/Linux" +.TH "DSELECT" "1" "Julio de 2001" "Proyecto Debian" "Debian GNU/Linux" .SH "NOMBRE" dselect \- Interfaz del manipulador de paquetes Debian para consola. .SH "SINOPSIS" diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am new file mode 100644 index 00000000..abae2060 --- /dev/null +++ b/man/fr/Makefile.am @@ -0,0 +1,21 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/fr + +dist_man_MANS = \ + cleanup-info.8 \ + deb-control.5 \ + deb.5 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + install-info.8 \ + start-stop-daemon.8 \ + update-alternatives.8 diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index c185fe97..a75f83bd 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -1,48 +1,514 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -frman1dir = $(subst $(mandir),$(mandir)/fr,$(man1dir)) -frman5dir = $(subst $(mandir),$(mandir)/fr,$(man5dir)) -frman8dir = $(subst $(mandir),$(mandir)/fr,$(man8dir)) +# 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. -MAN1PAGES = dpkg-deb.1 dpkg-name.1 dpkg-source.1 dpkg-scanpackages.1 \ - dpkg-scansources.1 -MAN5PAGES = deb-control.5 deb.5 -MAN8PAGES = cleanup-info.8 dpkg.8 dpkg-divert.8 install-info.8 \ - start-stop-daemon.8 update-alternatives.8 \ - dpkg-statoverride.8 dpkg-split.8 dpkg-query.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/fr +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/fr +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + cleanup-info.8 \ + deb-control.5 \ + deb.5 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-split.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + install-info.8 \ + start-stop-daemon.8 \ + update-alternatives.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/fr/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/fr/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: -install-program: +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(frman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(frman1dir) ; \ - done - $(mkinstalldirs) $(DESTDIR)$(frman5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(frman5dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(frman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(frman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: all clean distclean install install-doc install-program +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +# 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/man/fr/cleanup-info.8 b/man/fr/cleanup-info.8 index 18d19e04..c5a25e48 100644 --- a/man/fr/cleanup-info.8 +++ b/man/fr/cleanup-info.8 @@ -52,6 +52,6 @@ Copyright (C) 1996 Kim-Minh Kaplan. C'est un logiciel libre ; voyez la «\ GNU General Public Licence\ » version 2 ou supérieure pour le copyright. Il n'y a PAS de garantie. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . - +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/deb-control.5 b/man/fr/deb-control.5 index 7d14e77c..3daec869 100644 --- a/man/fr/deb-control.5 +++ b/man/fr/deb-control.5 @@ -217,6 +217,4 @@ Description: GNU grep, egrep and fgrep. .BR dpkg (8), .BR dpkg-deb (1). .SH TRADUCTION -Philippe Batailler, 2005. -Veuillez signaler toute erreur à . - +Philippe Batailler, Octobre 2003. diff --git a/man/fr/dpkg-checkbuilddeps.1 b/man/fr/dpkg-checkbuilddeps.1 deleted file mode 100644 index 7f8ac71e..00000000 --- a/man/fr/dpkg-checkbuilddeps.1 +++ /dev/null @@ -1,32 +0,0 @@ -.\" This file was generated with po4a. Translate the source file. -.\" -.TH DPKG\-CHECKBUILDDEPS 1 "Février 2001" "Projet debian" "Utilitaires de dpkg" -.SH NOM -dpkg\-checkbuilddeps \- vérifier les dépendances et les conflits de -construction -.SH SYNOPSIS -\fBdpkg\-checkbuilddeps\fP \-B [\fIfichier\-control\fP] -.SH DESCRIPTION -Ce programme vérifie si les dépendances et les conflits de construction -listés dans le fichier control existent dans les paquets installés sur le -système. S'il en existe, il les affiche et se termine avec un code de retour -différent de 0. -.P -Normalement, le fichier \fBdebian/control\fP est lu, mais un autre fichier peut -être indiqué sur la ligne de commande. -.SH OPTIONS -.TP -\fI\-B\fP -Ignore les lignes Build\-Depends\-Indep. À utiliser quand aucun paquet -indépendant d'une architecture ne sera construit. -.SH AUTEUR -Copyright 2001 Joey Hess -.UR mailto:joeyh@debian.org - -.UE -.sp -C'est un logiciel libre. Voyez la «\ GNU General Public Licence\ » version 2 -ou supérieure pour le copyright. Il n'y a pas de garantie. -.SH TRADUCTION -Philippe Batailler, 2005. -Veuillez signaler toute erreur à . diff --git a/man/fr/dpkg-deb.1 b/man/fr/dpkg-deb.1 index b9be0ada..1d1f4820 100644 --- a/man/fr/dpkg-deb.1 +++ b/man/fr/dpkg-deb.1 @@ -169,5 +169,6 @@ General Public Licence\ \fB/usr/share/doc/dpkg/copyright\fR et \fB/usr/share/common\-licenses/GPL\fR pour des précisions. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg-divert.8 b/man/fr/dpkg-divert.8 index e0fd5319..7c75dae7 100644 --- a/man/fr/dpkg-divert.8 +++ b/man/fr/dpkg-divert.8 @@ -90,5 +90,6 @@ Copyright (C) 1995 Ian Jackson. C'est un logiciel libre ; voyez la « GNU General Public Licence » version 2 ou supérieure pour le copyright. Il n'y a PAS de garantie. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg-name.1 b/man/fr/dpkg-name.1 index 6079c8ce..b0a00540 100644 --- a/man/fr/dpkg-name.1 +++ b/man/fr/dpkg-name.1 @@ -94,5 +94,6 @@ Copyright 1995,1996 Erick Branderhorst. \fBdpkg\-name\fR est un logiciel libre\ ; voyez la «\ GNU General Public Licence\ » version 2 ou supérieure pour le copyright. Il n'y a \fBpas\fR de garantie. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg-query.8 b/man/fr/dpkg-query.1 similarity index 97% rename from man/fr/dpkg-query.8 rename to man/fr/dpkg-query.1 index eb446774..55977d8e 100644 --- a/man/fr/dpkg-query.8 +++ b/man/fr/dpkg-query.1 @@ -1,6 +1,6 @@ .\" This file was generated with po4a. Translate the source file. .\" -.TH DPKG\-QUERY 8 "Août 2001" "Projet Debian" "suite dpkg" +.TH DPKG\-QUERY 1 "Août 2001" "Projet Debian" "suite dpkg" .SH NOM dpkg\-query \- Un outil pour interroger la base de données de dpkg @@ -89,9 +89,12 @@ Copyright 2001 Wichert Akkerman C'est un logiciel libre ; voyez la licence publique générale du projet GNU version 2 ou supérieure pour les droits de copie. Il n'y a PAS de garantie. + + .SH "Voir aussi" \fBdpkg\fR(8) .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. diff --git a/man/fr/dpkg-scanpackages.1 b/man/fr/dpkg-scanpackages.1 index a55b17b6..a7df4859 100644 --- a/man/fr/dpkg-scanpackages.1 +++ b/man/fr/dpkg-scanpackages.1 @@ -14,22 +14,22 @@ .\" License along with dpkg; if not, write to the Free Software .\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. .\" Traduction de la version cvs 1.4 -.TH DPKG\-SCANPACKAGES 1 "1996-07-08" "Projet Debian" "Utilitaires de Dpkg" +.TH DPKG-SCANPACKAGES 1 "1996-07-08" "Projet Debian" "Utilitaires de Dpkg" .SH NOM -dpkg\-scanpackages - créer des fichiers «\ Packages\ » +dpkg-scanpackages \- créer des fichiers «\ Packages\ » . .SH SYNOPSIS -.B dpkg\-scanpackages -.RI [ \-u ] -.RI [ \-a ] -.I rep\-de\-binaires -.I fichier\-d'\-override -.RI [ chemin\-à\-préfixer ] +.B dpkg-scanpackages +.RI [ -u ] +.RI [ -a ] +.I rep-de-binaires +.I fichier-d'-override +.RI [ chemin-à-préfixer ] .B > .I Packages . .SH DESCRIPTION -.B dpkg\-scanpackages +.B dpkg-scanpackages trie une arborescence contenant des paquets binaires Debian et crée un fichier «\ Packages\ » qui permettra à .BR dselect (8), @@ -38,29 +38,29 @@ qu'il peut installer. Ces fichiers «\ Packages\ » sont semblables à ceux qu'on peut trouver sur les sites d'archives Debian ou sur des cédéroms. Quand on crée un répertoire contenant des paquets qu'on veut installer sur -un ensemble de machines, on peut se servir soi\-même de -.B dpkg\-scanpackages. +un ensemble de machines, on peut se servir soi-même de +.B dpkg-scanpackages. .PP -.I rep\-de\-binaires +.I rep-de-binaires est le nom de l'arborescence binaire (par exemple -.BR contrib/binary\-i386) +.BR contrib/binary-i386) que l'on veut traiter. Il vaut mieux qu'elle soit relative à la racine de l'archive Debian\ ; ainsi chaque champ «\ Filename\ » dans le nouveau fichier «\ Packages\ » commencera par cette chaîne. .PP -.I fichier\-d'\-override +.I fichier-d'-override est le nom du fichier qui contient les renseignements sur la manière dont le -paquet s'insère dans la distribution\ ; voir ci\-dessous. +paquet s'insère dans la distribution\ ; voir ci-dessous. .PP -.I chemin\-à\-préfixer +.I chemin-à-préfixer est une chaîne facultative qui préfixera les champs «\ Filename\ ». .PP Si l'option -.I \-u +.I -u est spécifiée, la commande recherche des *.udeb au lieu de *.deb. .PP -Quand \-a\fI\fP est spécifiée, la commande ne recherche pas tous les +Quand -a\fI\fP est spécifiée, la commande ne recherche pas tous les fichiers debs\ ; elle utilise un motif équivalent à *_all.deb et à *_arch.deb. .SH LE FICHIER « OVERRIDE » @@ -81,7 +81,7 @@ Les commentaires commencent par un caract .I priorité .I section .RI [ responsable ] -.in \-5 +.in -5 .PP .I paquet est le nom du paquet. Les entrées du fichier «\ override\ » concernant des @@ -93,8 +93,8 @@ et .I section placent le paquet dans l'arborescence\ ; on ne devrait pas les trouver dans le fichier «\ control\ ». Quand le paquet se trouve dans un -sous\-répertoire de -.IR rep\-de\-binaires, +sous-répertoire de +.IR rep-de-binaires, on le compare avec le contenu de .IR section . .PP @@ -113,16 +113,16 @@ fichiers officiels des miroirs Debian. . .SH DIAGNOSTICS -.B dpkg\-scanpackages -affiche les erreurs habituelles qui se comprennent d'elles\-mêmes. Il +.B dpkg-scanpackages +affiche les erreurs habituelles qui se comprennent d'elles-mêmes. Il affiche aussi des avertissements quand des paquets sont dans un mauvais -sous\-répertoire, existent en double exemplaire, ont des champs +sous-répertoire, existent en double exemplaire, ont des champs «\ Filename\ » dans leur fichier «\ control\ », sont absents du fichier «\ override\ » ou bien dont les substitutions de responsable ne peuvent pas s'appliquer. .SH VOIR AUSSI .BR dpkg (8), .BR dselect (8), -.BR dpkg\-scansources (1). +.BR dpkg-scansources (1). .SH TRADUCTION -Philippe Batailler , Avril 2005. +Philippe Batailler , Octobre 2003. diff --git a/man/fr/dpkg-scansources.1 b/man/fr/dpkg-scansources.1 index 7bc97aa1..48be7b2d 100644 --- a/man/fr/dpkg-scansources.1 +++ b/man/fr/dpkg-scansources.1 @@ -217,7 +217,7 @@ priorit les champs «\ maintainer\ » donnés dans les fichiers \fI.dsc\fR. Voyez la page de manuel \fIdpkg-scanpackages\fR pour connaître le format de ce fichier. NB : le fichier \fIfichier-d'-override\fR étant indexé par paquets binaires -et non par paquets source, il y a un petit problème ! Parmi tous les paquets +et non par paquets sources, il y a un petit problème ! Parmi tous les paquets binaires produits par un fichier \fI.dsc\fR, l'implémentation actuelle affecte la priorité la plus élevée au paquet source ; et elle se sert de l'entrée « override » du premier paquet binaire listé dans @@ -252,7 +252,7 @@ dpkg-\fIscanpackages\fR\|(8) .SH "AUTEUR" Roderick Schertler .SH "TRADUCTION" -Philippe Batailler, 2005. +Philippe Batailler, Janvier 2001. .rn }` '' .IX Title "DPKG-SCANSOURCES 1" .IX Name "dpkg-scansources - prog" diff --git a/man/fr/dpkg-source.1 b/man/fr/dpkg-source.1 index 06782f6c..00d8a2a2 100644 --- a/man/fr/dpkg-source.1 +++ b/man/fr/dpkg-source.1 @@ -596,5 +596,6 @@ C'est un logiciel libre\ ; voyez la \fB/usr/share/doc/dpkg/copyright\fR et \fB/usr/share/common-licenses/GPL\fR pour des précisions. .SH TRADUCTION -Philippe Batailler, 2005. -Veuillez signaler toute erreur à . \ No newline at end of file +Philippe Batailler, 2004. +Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg-split.8 b/man/fr/dpkg-split.1 similarity index 98% rename from man/fr/dpkg-split.8 rename to man/fr/dpkg-split.1 index b7a7a14e..03d5acc5 100644 --- a/man/fr/dpkg-split.8 +++ b/man/fr/dpkg-split.1 @@ -125,11 +125,11 @@ Indique un r attente d'une recomposition automatique. Par défaut, c'est le répertoire \fB/var/lib/dpkg\fR. .TP -.BI \-\-partsize\fR|\fB\-S " kbytes" +.BI \-\-partsize|-S " kbytes" Indique, en kilooctets (1024 octets), la taille maximum d'une partie lors d'une décomposition. Par défaut, la taille maximum est de 450 ko. .TP -.BI \-\-output\fR|\fB\-O " fichier\-complet" +.BI \-\-output|\-O " fichier\-complet" Indique le nom du fichier à produire pour une recomposition. Cela annule le fichier par défaut lors d'une recomposition «\ à la main\ » @@ -198,5 +198,6 @@ Copyright (C) 1995-1996 Ils ont Licence\ »\ ; il n'y a PAS de GARANTIE. Voyez \fB/usr/share/dpkg/copyright\fR et \fB/usr/share/common\-licenses/GPL\fR pour des précisions. .SH TRADUCTION -Philippe Batailler, 2005. -Veuillez signaler toute erreur à . \ No newline at end of file +Philippe Batailler, 2004. +Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg-statoverride.8 b/man/fr/dpkg-statoverride.8 index 6ce73b7c..2c12678c 100644 --- a/man/fr/dpkg-statoverride.8 +++ b/man/fr/dpkg-statoverride.8 @@ -84,5 +84,6 @@ Ce programme est un logiciel libre\ ; voyez la licence publique g projet GNU version 2 ou supérieure pour les droits de copie. Il n'y a PAS de garantie. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/dpkg.8 b/man/fr/dpkg.1 similarity index 99% rename from man/fr/dpkg.8 rename to man/fr/dpkg.1 index c9561786..df97f6bc 100644 --- a/man/fr/dpkg.8 +++ b/man/fr/dpkg.1 @@ -1,6 +1,6 @@ .\" This file was generated with po4a. Translate the source file. .\" -.TH DPKG 8 "12 avril 1998" "Projet Debian" "suite dpkg" +.TH DPKG 1 "12 avril 1998" "Projet Debian" "suite dpkg" .SH NOM dpkg \- un gestionnaire de paquet de niveau intermédiaire pour Debian @@ -629,5 +629,6 @@ Voyez le fichier \fB/usr/share/doc/dpkg/THANKS.gz\fR pour la liste des personnes qui ont contribué à \fBdpkg\fR. .fi .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. diff --git a/man/fr/install-info.8 b/man/fr/install-info.8 index 2aed9a16..9f33ecbb 100644 --- a/man/fr/install-info.8 +++ b/man/fr/install-info.8 @@ -205,5 +205,6 @@ Copyright 1994, Ian Jackson. \fBinstall\-info\fR est un logiciel libre\ ; voyez la «\ GNU General Public Licence\ » version 2 ou supérieure pour le copyright. Il \fIn'y a pas\fR de garantie. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/start-stop-daemon.8 b/man/fr/start-stop-daemon.8 index eb46d156..c9bf9411 100644 --- a/man/fr/start-stop-daemon.8 +++ b/man/fr/start-stop-daemon.8 @@ -51,7 +51,7 @@ doivent survivre .TP .B \-x\fR|\fB\-\-exec\fR \fIexécutable Cherche les processus qui sont des exemplaires de cet exécutable (selon -.B /proc/\fIpid\fB/exe\fP ). +.B /proc/\fR\fIpid\fR\fB/exe\fR). .TP .B \-p\fR|\fB\-\-pidfile\fR \fIpid\-file Cherche les processus dont les identifiants sont précisés dans \fIpid\-file.\fR @@ -65,7 +65,7 @@ Modifie le \fIgroup\fR ou le \fIgid\fR au d .TP .B \-n\fR|\fB\-\-name\fR \fInomdeprocessus Cherche les processus dont le nom est \fInomdeprocessus\fR (selon -.B /proc/\fIpid\fB/stat\fP ). +.B /proc/\fR\fIpid\fR\fB/stat\fR). .TP .B \-s\fR|\fB\-\-signal\fR \fIsignal Avec l'action \fB\-\-stop,\fR on définit le signal à envoyer au processus qui @@ -171,5 +171,6 @@ d'une version faite par Ian Jackson . Page de manuel par Klee Dienes , partiellement reformattée par Ian Jackson. .SH TRADUCTION -Philippe Batailler, 2005. -Veuillez signaler toute erreur à . \ No newline at end of file +Philippe Batailler, 2004. +Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/fr/update-alternatives.8 b/man/fr/update-alternatives.8 index 2c3f053e..c3747b8d 100644 --- a/man/fr/update-alternatives.8 +++ b/man/fr/update-alternatives.8 @@ -316,5 +316,6 @@ tous les syst .SH "VOIR AUSSI" \fBln\fR(1), FHS, le standard pour l'organisation des systèmes de fichiers. .SH TRADUCTION -Philippe Batailler, 2005. +Philippe Batailler, 2004. Veuillez signaler toute erreur à . +dpkg, version 1.10.23. \ No newline at end of file diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am new file mode 100644 index 00000000..25867bff --- /dev/null +++ b/man/ja/Makefile.am @@ -0,0 +1,26 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/ja + +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-architecture.1 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dselect.1 \ + install-info.8 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index c3cf4aa5..fab92b84 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -1,49 +1,519 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -jaman1dir = $(subst $(mandir),$(mandir)/ja,$(man1dir)) -jaman5dir = $(subst $(mandir),$(mandir)/ja,$(man5dir)) -jaman8dir = $(subst $(mandir),$(mandir)/ja,$(man8dir)) +# 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. -MAN1PAGES = dpkg-deb.1 md5sum.1 822-date.1 dpkg-name.1 \ - dpkg-checkbuilddeps.1 dpkg-architecture.1 dpkg-source.1 \ - dpkg-scanpackages.1 dpkg-scansources.1 -MAN5PAGES = deb-old.5 deb.5 deb-control.5 -MAN8PAGES = dpkg.8 dselect.8 install-info.8 start-stop-daemon.8 \ - update-alternatives.8 cleanup-info.8 dpkg-divert.8 \ - dpkg-query.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/ja +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/ja +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + 822-date.1 \ + cleanup-info.8 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-architecture.1 \ + dpkg-checkbuilddeps.1 \ + dpkg-deb.1 \ + dpkg-divert.8 \ + dpkg-name.1 \ + dpkg-query.1 \ + dpkg-scanpackages.1 \ + dpkg-scansources.1 \ + dpkg-source.1 \ + dpkg-statoverride.8 \ + dpkg.1 \ + dselect.1 \ + install-info.8 \ + md5sum.1 \ + start-stop-daemon.8 \ + update-alternatives.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/ja/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/ja/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: -install-program: +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(jaman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(jaman1dir) ; \ - done - $(mkinstalldirs) $(DESTDIR)$(jaman5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(jaman5dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(jaman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(jaman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: all clean distclean install install-doc install-program +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +# 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/man/ja/dpkg-query.8 b/man/ja/dpkg-query.1 similarity index 98% rename from man/ja/dpkg-query.8 rename to man/ja/dpkg-query.1 index b46974be..f9ae8a12 100644 --- a/man/ja/dpkg-query.8 +++ b/man/ja/dpkg-query.1 @@ -1,6 +1,6 @@ .\" Original manpage cvs revision 1.3.2.1 .\" Translated by KISE Hiroshi -.TH DPKG\-QUERY 8 "August 2001" "Debian Project" "dpkg suite" +.TH DPKG\-QUERY 1 "August 2001" "Debian Project" "dpkg suite" .SH ̾Á° dpkg\-query \- dpkg ¥Ç¡¼¥¿¥Ù¡¼¥¹Ì䤤¹ç¤ï¤»¥Ä¡¼¥ë diff --git a/man/ja/dpkg.8 b/man/ja/dpkg.1 similarity index 99% rename from man/ja/dpkg.8 rename to man/ja/dpkg.1 index ee946be6..e59f76d9 100644 --- a/man/ja/dpkg.8 +++ b/man/ja/dpkg.1 @@ -25,7 +25,7 @@ .\"WORD: conflicts ¶¥¹ç¤¹¤ë .\"WORD: hold (¥Ñ¥Ã¥±¡¼¥¸¤Î)Êѹ¹¶Ø»ß .\"WORD: avail ÍøÍѲÄǽ -.TH DPKG 8 "April 12, 1998" "Debian Project" "dpkg suite" +.TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite" .SH ̾Á° dpkg \- Debian Ãæ´Ö¥ì¥Ù¥ë¥Ñ¥Ã¥±¡¼¥¸¥Þ¥Í¡¼¥¸¥ã diff --git a/man/ja/dselect.8 b/man/ja/dselect.1 similarity index 99% rename from man/ja/dselect.8 rename to man/ja/dselect.1 index 8527d15b..5e8796ce 100644 --- a/man/ja/dselect.8 +++ b/man/ja/dselect.1 @@ -14,7 +14,7 @@ .\"WORD: access method ¥¢¥¯¥»¥¹Êý¼° .\"WORD: status ¾õ¶· .\"WORD: interactive ÂÐÏÃŪ -.TH DSELECT 8 "July 2001" "Debian Project" "Debian" +.TH DSELECT 1 "July 2001" "Debian Project" "Debian" .\" .SH NAME .SH ̾¾Î .\" dselect \- Debian package management frontend diff --git a/man/paths.ent b/man/paths.ent deleted file mode 100644 index 9020c4cb..00000000 --- a/man/paths.ent +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/man/paths.ent.in b/man/paths.ent.in deleted file mode 100644 index cd5099c4..00000000 --- a/man/paths.ent.in +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/man/pt_BR/Makefile.am b/man/pt_BR/Makefile.am new file mode 100644 index 00000000..61a2cf03 --- /dev/null +++ b/man/pt_BR/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/pt_BR + +dist_man_MANS = \ + dpkg.1 \ + dselect.1 \ + update-alternatives.8 diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in index 2eaf2472..80385d3b 100644 --- a/man/pt_BR/Makefile.in +++ b/man/pt_BR/Makefile.in @@ -1,29 +1,455 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -ptman8dir = $(subst $(mandir),$(mandir)/pt_BR,$(man8dir)) +# 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. -MAN8PAGES = update-alternatives.8 dpkg.8 dselect.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/pt_BR +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/pt_BR +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + dpkg.1 \ + dselect.1 \ + update-alternatives.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/pt_BR/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/pt_BR/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(ptman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(ptman8dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man8 -.PHONY: all clean distclean install install-doc +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man8 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man8 +# 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/man/pt_BR/dpkg.8 b/man/pt_BR/dpkg.1 similarity index 99% rename from man/pt_BR/dpkg.8 rename to man/pt_BR/dpkg.1 index f0b5638e..772b9e59 100644 --- a/man/pt_BR/dpkg.8 +++ b/man/pt_BR/dpkg.1 @@ -1,4 +1,4 @@ -.TH DPKG 8 "April 12, 1998" "Debian Project" "dpkg suite" +.TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite" .SH NOME dpkg \- um gerenciador de pacotes de nível médio para o Debian diff --git a/man/pt_BR/dselect.8 b/man/pt_BR/dselect.1 similarity index 99% rename from man/pt_BR/dselect.8 rename to man/pt_BR/dselect.1 index e55cccac..9993f795 100644 --- a/man/pt_BR/dselect.8 +++ b/man/pt_BR/dselect.1 @@ -1,5 +1,5 @@ .\" Tradução da versão cvs 1.1 -.TH DSELECT 8 "Julho 2001" "Projeto Debian" "Debian" +.TH DSELECT 1 "Julho 2001" "Projeto Debian" "Debian" .SH NOME dselect \- Frontend de gerenciamento de pacotes Debian .SH RESUMO diff --git a/man/pt_BR/update-alternatives.8 b/man/pt_BR/update-alternatives.8 index 472b1465..34d95f97 100644 --- a/man/pt_BR/update-alternatives.8 +++ b/man/pt_BR/update-alternatives.8 @@ -152,7 +152,7 @@ Lhe ser em grupo. Uma vez que você faça uma mudança, a ligação em grupo não estará mais no modo .I auto -Você precisará usar a opção +. Você precisará usar a opção .I --auto para poder retornar ao estado automático. .SH TERMINOLOGIA diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am new file mode 100644 index 00000000..d4a8e7bf --- /dev/null +++ b/man/ru/Makefile.am @@ -0,0 +1,10 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/ru + +dist_man_MANS = \ + 822-date.1 \ + deb-control.5 \ + dpkg-checkbuilddeps.1 \ + dpkg.1 \ + start-stop-daemon.8 diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index ae87df5c..53078799 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -1,43 +1,503 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -ruman1dir = $(subst $(mandir),$(mandir)/ru,$(man1dir)) -ruman5dir = $(subst $(mandir),$(mandir)/ru,$(man5dir)) -ruman8dir = $(subst $(mandir),$(mandir)/ru,$(man8dir)) +# 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. -MAN1PAGES = 822-date.1 dpkg-checkbuilddeps.1 -MAN5PAGES = deb-control.5 -MAN8PAGES = dpkg.8 start-stop-daemon.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/ru +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/ru +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + 822-date.1 \ + deb-control.5 \ + dpkg-checkbuilddeps.1 \ + dpkg.1 \ + start-stop-daemon.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/ru/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/ru/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc - -install-doc: - $(mkinstalldirs) $(DESTDIR)$(ruman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(ruman1dir) ; \ +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ done - $(mkinstalldirs) $(DESTDIR)$(ruman5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(ruman5dir) ; \ +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(ruman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(ruman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: all clean distclean install install-doc +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +# 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/man/ru/dpkg.8 b/man/ru/dpkg.1 similarity index 99% rename from man/ru/dpkg.8 rename to man/ru/dpkg.1 index 2deee82a..e0e531ab 100644 --- a/man/ru/dpkg.8 +++ b/man/ru/dpkg.1 @@ -2,7 +2,7 @@ .\" .\" Updated by alexm@hsys.msk.ru to r1.29 of dpkg.8 from CVS .\" -.TH DPKG 8 "12 ÁÐÒÅÌÑ 1998" "ðÒÏÅËÔ Debian" "ðÁËÅÔ dpkg" +.TH DPKG 1 "12 ÁÐÒÅÌÑ 1998" "ðÒÏÅËÔ Debian" "ðÁËÅÔ dpkg" .SH éíñ dpkg \- ÓÒÅÄÎÅÕÒÏ×ÎÅ×ÙÊ ÍÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÄÌÑ Debian diff --git a/man/sv/.check.pl b/man/sv/.check.pl deleted file mode 100755 index 9993efc2..00000000 --- a/man/sv/.check.pl +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/perl -w - -# Source file directories -my %source = ( - 'deb.5' => 'man/en', - 'deb-old.5' => 'man/en', - 'deb-control.5' => 'man/en', - 'dpkg.cfg.5' => 'man/en', - 'dselect.cfg.5' => 'man/en', - 'dpkg-query.8' => 'main', - 'dpkg.8' => 'main', - 'dpkg-split.8' => 'split', - 'md5sum.1' => 'utils', - 'start-stop-daemon.8' => 'utils', - 'dpkg-deb.1' => 'dpkg-deb', - '822-date.1' => 'scripts', - 'dpkg-checkbuilddeps.1' => 'scripts', - 'dpkg-source.1' => 'scripts', - 'dpkg-statoverride.8' => 'scripts', - 'dpkg-divert.8' => 'scripts', - 'dpkg-architecture.1' => 'scripts', - 'dpkg-scanpackages.1' => 'scripts', - 'update-alternatives.8' => 'scripts', - 'install-info.8' => 'scripts', - 'dpkg-name.1' => 'scripts', - 'cleanup-info.8' => 'scripts', - 'dselect.8' => 'dselect', -); - -# Read directory to find translated files -opendir CURDIR, '.' or die "Cannot read directory: $!\n"; -FILE: foreach $file (readdir(CURDIR)) -{ - next FILE unless $file =~ /\.[1-8]$/; - - # Locate revision number - my $revision = undef; - open DOC, "$file" or die "Cannot read file: $!\n"; - LINE: while () - { - if (/Translation of CVS revision ([0-9\.]*)$/) - { - $revision = $1; - last LINE; - } - } - close DOC; - - die "Unable to find translated revision in $file\n" - unless defined $revision; - - # Check revision number against that in the CVS - my $original = undef; - open ENTRIES, "../../$source{$file}/CVS/Entries" - or die "Cannot open ../../$source{$file}/CVS/Entries: $!\n"; - ENTRY: while () - { - if (m"^/$file/([0-9\.]+)/") - { - $original = $1; - last ENTRY; - } - } - close ENTRIES; - - die "Unable to find original revision for $file\n" - unless defined $original; - - # Check if version is up-to-date - if ($revision eq $original) - { - print "$file is up to date\n"; - } - else - { - print "$file translates $revision, current $source{$file}/$file is $original\n"; - } -} - -closedir CURDIR; diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am new file mode 100644 index 00000000..4b849044 --- /dev/null +++ b/man/sv/Makefile.am @@ -0,0 +1,18 @@ +## Process this file with automake to produce Makefile.in + +mandir = @mandir@/sv + +dist_man_MANS = \ + 822-date.1 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-deb.1 \ + dpkg-query.1 \ + dpkg-split.1 \ + dpkg.1 \ + dpkg.cfg.5 \ + dselect.1 \ + dselect.cfg.5 \ + md5sum.1 \ + start-stop-daemon.8 diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in index d2fce89a..4b7a0f02 100644 --- a/man/sv/Makefile.in +++ b/man/sv/Makefile.in @@ -1,45 +1,511 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -default: all -include ../../Makefile.conf +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. -svman1dir = $(subst $(mandir),$(mandir)/sv,$(man1dir)) -svman5dir = $(subst $(mandir),$(mandir)/sv,$(man5dir)) -svman8dir = $(subst $(mandir),$(mandir)/sv,$(man8dir)) +# 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. -MAN1PAGES = 822-date.1 dpkg-deb.1 md5sum.1 -MAN5PAGES = deb.5 deb-control.5 deb-old.5 dpkg.cfg.5 dselect.cfg.5 -MAN8PAGES = dpkg.8 dpkg-query.8 dpkg-split.8 dselect.8 start-stop-daemon.8 +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = man/sv +DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@/sv +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +dist_man_MANS = \ + 822-date.1 \ + deb-control.5 \ + deb-old.5 \ + deb.5 \ + dpkg-deb.1 \ + dpkg-query.1 \ + dpkg-split.1 \ + dpkg.1 \ + dpkg.cfg.5 \ + dselect.1 \ + dselect.cfg.5 \ + md5sum.1 \ + start-stop-daemon.8 -all: +all: all-am -clean: +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/sv/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/sv/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -distclean: clean - $(RM) Makefile +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install: install-doc +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done +tags: TAGS +TAGS: -install-program: +ctags: CTAGS +CTAGS: -install-doc: - $(mkinstalldirs) $(DESTDIR)$(svman1dir) - set -e ; for i in $(MAN1PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(svman1dir) ; \ - done - $(mkinstalldirs) $(DESTDIR)$(svman5dir) - set -e ; for i in $(MAN5PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(svman5dir) ; \ + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ done - $(mkinstalldirs) $(DESTDIR)$(svman8dir) - set -e ; for i in $(MAN8PAGES) ; do \ - if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \ - $(INSTALL_DATA) $$d$$i $(DESTDIR)$(svman8dir) ; \ +check-am: all-am +check: check-am +all-am: Makefile $(MANS) +installdirs: + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -.PHONY: all clean distclean install install-doc install-program +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-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-man1 install-man5 install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 +# 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/man/sv/dpkg-query.8 b/man/sv/dpkg-query.1 similarity index 97% rename from man/sv/dpkg-query.8 rename to man/sv/dpkg-query.1 index fbfd6b4a..7ecbb701 100644 --- a/man/sv/dpkg-query.8 +++ b/man/sv/dpkg-query.1 @@ -1,5 +1,5 @@ .\" Translation of CVS revision 1.3.2.2 -.TH DPKG\-QUERY 8 "Augusti 2001" "Debianprojektet" "Dpkg-sviten" +.TH DPKG\-QUERY 1 "Augusti 2001" "Debianprojektet" "Dpkg-sviten" .SH NAMN dpkg\-query \- ett verktyg för att fråga dpkg-databasen diff --git a/man/sv/dpkg-split.8 b/man/sv/dpkg-split.1 similarity index 100% rename from man/sv/dpkg-split.8 rename to man/sv/dpkg-split.1 diff --git a/man/sv/dpkg.8 b/man/sv/dpkg.1 similarity index 99% rename from man/sv/dpkg.8 rename to man/sv/dpkg.1 index 0cdd1414..294d9262 100644 --- a/man/sv/dpkg.8 +++ b/man/sv/dpkg.1 @@ -1,6 +1,6 @@ .\" Hey Emacs! This file is -*- nroff -*- source. .\" Translation of CVS revision 1.32.2.4 -.TH DPKG 8 "12 april 1998" "Debianprojektet" "Dpkg-sviten" +.TH DPKG 1 "12 april 1998" "Debianprojektet" "Dpkg-sviten" .SH NAMN dpkg - en mellannivåpakethanterare för Debian diff --git a/man/sv/dselect.8 b/man/sv/dselect.1 similarity index 99% rename from man/sv/dselect.8 rename to man/sv/dselect.1 index 8cbbc7ed..f82e606f 100644 --- a/man/sv/dselect.8 +++ b/man/sv/dselect.1 @@ -1,5 +1,5 @@ .\" Translation of CVS revision 1.8.2.2 -.TH DSELECT 8 "Juli 2001" "Debianprojektet" "Debian" +.TH DSELECT 1 "Juli 2001" "Debianprojektet" "Debian" .SH NAMN dselect \- Debians pakethanteringssystem .SH SYNOPS diff --git a/methods/Makefile b/methods/Makefile deleted file mode 100644 index a5ea2132..00000000 --- a/methods/Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -srcdir = . -top_srcdir = .. - -default: all -include ../Makefile.conf - -# Available methods -METHODS = disk floppy -# Scripts each method must have -METHOD_SCRIPTS = setup update install - -.PHONY: all -all:: - -.PHONY: install -install:: all install-program install-doc - -.PHONY: clean -clean:: - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)$(methodsdir) - $(mkinstalldirs) $(DESTDIR)$(admindir)/methods/mnt - set -e ; for m in $(METHODS) ; do \ - $(mkinstalldirs) $(DESTDIR)$(admindir)/methods/$$m ; \ - $(mkinstalldirs) $(DESTDIR)$(methodsdir)/$$m ; \ - for s in $(METHOD_SCRIPTS) ; do \ - $(INSTALL_SCRIPT) $(srcdir)/$$m.$$s $(DESTDIR)$(methodsdir)/$$m/$$s ; \ - done ; \ - $(INSTALL_DATA) $(srcdir)/$$m.names $(DESTDIR)$(methodsdir)/$$m/names ; \ - for n in `cut -d ' ' -f 2 $(srcdir)/$$m.names` ; do \ - rn=`echo $$n | $(SED) -e 's,\.,/,'` ; \ - $(INSTALL_DATA) $(srcdir)/$$m.desc.$$n $(DESTDIR)$(methodsdir)/$$m/desc.$$n ; \ - done ; \ - done - -.PHONY: install-doc -install-doc: - diff --git a/methods/Makefile.am b/methods/Makefile.am new file mode 100644 index 00000000..0542069e --- /dev/null +++ b/methods/Makefile.am @@ -0,0 +1,26 @@ +## Process this file with automake to produce Makefile.in + +methodsdir = $(pkglibdir)/methods + +nobase_dist_methods_DATA = \ + disk/names \ + disk/desc.cdrom \ + disk/desc.nfs \ + disk/desc.harddisk \ + disk/desc.mounted \ + floppy/names \ + floppy/desc.floppy + +nobase_dist_methods_SCRIPTS = \ + disk/setup \ + disk/update \ + disk/install \ + floppy/setup \ + floppy/update \ + floppy/install + + +install-data-local: + $(mkdir_p) $(DESTDIR)$(admindir)/methods/mnt + $(mkdir_p) $(DESTDIR)$(admindir)/methods/disk + $(mkdir_p) $(DESTDIR)$(admindir)/methods/floppy diff --git a/methods/Makefile.in b/methods/Makefile.in index e002748f..dbb42342 100644 --- a/methods/Makefile.in +++ b/methods/Makefile.in @@ -1,45 +1,443 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ - -default: all -include ../Makefile.conf - -# Available methods -METHODS = disk floppy -# Scripts each method must have -METHOD_SCRIPTS = setup update install - -.PHONY: all -all:: - -.PHONY: install -install:: all install-program install-doc - -.PHONY: clean -clean:: - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - -.PHONY: install-program -install-program: - $(mkinstalldirs) $(DESTDIR)$(methodsdir) - $(mkinstalldirs) $(DESTDIR)$(admindir)/methods/mnt - set -e ; for m in $(METHODS) ; do \ - $(mkinstalldirs) $(DESTDIR)$(admindir)/methods/$$m ; \ - $(mkinstalldirs) $(DESTDIR)$(methodsdir)/$$m ; \ - for s in $(METHOD_SCRIPTS) ; do \ - $(INSTALL_SCRIPT) $(srcdir)/$$m.$$s $(DESTDIR)$(methodsdir)/$$m/$$s ; \ - done ; \ - $(INSTALL_DATA) $(srcdir)/$$m.names $(DESTDIR)$(methodsdir)/$$m/names ; \ - for n in `cut -d ' ' -f 2 $(srcdir)/$$m.names` ; do \ - rn=`echo $$n | $(SED) -e 's,\.,/,'` ; \ - $(INSTALL_DATA) $(srcdir)/$$m.desc.$$n $(DESTDIR)$(methodsdir)/$$m/desc.$$n ; \ - done ; \ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ + + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = methods +DIST_COMMON = $(nobase_dist_methods_DATA) \ + $(nobase_dist_methods_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(methodsdir)" +nobase_dist_methodsSCRIPT_INSTALL = $(install_sh_SCRIPT) +SCRIPTS = $(nobase_dist_methods_SCRIPTS) +SOURCES = +DIST_SOURCES = +nobase_dist_methodsDATA_INSTALL = $(install_sh_DATA) +DATA = $(nobase_dist_methods_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +methodsdir = $(pkglibdir)/methods +nobase_dist_methods_DATA = \ + disk/names \ + disk/desc.cdrom \ + disk/desc.nfs \ + disk/desc.harddisk \ + disk/desc.mounted \ + floppy/names \ + floppy/desc.floppy + +nobase_dist_methods_SCRIPTS = \ + disk/setup \ + disk/update \ + disk/install \ + floppy/setup \ + floppy/update \ + floppy/install + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu methods/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu methods/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-nobase_dist_methodsSCRIPTS: $(nobase_dist_methods_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(methodsdir)" || $(mkdir_p) "$(DESTDIR)$(methodsdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(nobase_dist_methods_SCRIPTS)'; for p in $$list; do \ + case $$p in \ + $(srcdir)/*) p=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \ + echo " $(nobase_dist_methodsSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(methodsdir)/$$f'"; \ + $(nobase_dist_methodsSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(methodsdir)/$$f"; \ + else :; fi; \ + done + +uninstall-nobase_dist_methodsSCRIPTS: + @$(NORMAL_UNINSTALL) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(nobase_dist_methods_SCRIPTS)'; for p in $$list; do \ + case $$p in \ + $(srcdir)/*) p=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \ + echo " rm -f '$(DESTDIR)$(methodsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(methodsdir)/$$f"; \ done +uninstall-info-am: +install-nobase_dist_methodsDATA: $(nobase_dist_methods_DATA) + @$(NORMAL_INSTALL) + test -z "$(methodsdir)" || $(mkdir_p) "$(DESTDIR)$(methodsdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(nobase_dist_methods_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; \ + echo " $(nobase_dist_methodsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(methodsdir)/$$f'"; \ + $(nobase_dist_methodsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(methodsdir)/$$f"; \ + done + +uninstall-nobase_dist_methodsDATA: + @$(NORMAL_UNINSTALL) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(nobase_dist_methods_DATA)'; for p in $$list; do \ + case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; \ + echo " rm -f '$(DESTDIR)$(methodsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(methodsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/disk $(distdir)/floppy + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(SCRIPTS) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(methodsdir)" "$(DESTDIR)$(methodsdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-data-local install-nobase_dist_methodsDATA \ + install-nobase_dist_methodsSCRIPTS + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-nobase_dist_methodsDATA \ + uninstall-nobase_dist_methodsSCRIPTS + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am install-info \ + install-info-am install-man install-nobase_dist_methodsDATA \ + install-nobase_dist_methodsSCRIPTS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-nobase_dist_methodsDATA \ + uninstall-nobase_dist_methodsSCRIPTS -.PHONY: install-doc -install-doc: +install-data-local: + $(mkdir_p) $(DESTDIR)$(admindir)/methods/mnt + $(mkdir_p) $(DESTDIR)$(admindir)/methods/disk + $(mkdir_p) $(DESTDIR)$(admindir)/methods/floppy +# 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/methods/disk.desc.cdrom b/methods/disk/desc.cdrom similarity index 100% rename from methods/disk.desc.cdrom rename to methods/disk/desc.cdrom diff --git a/methods/disk.desc.harddisk b/methods/disk/desc.harddisk similarity index 100% rename from methods/disk.desc.harddisk rename to methods/disk/desc.harddisk diff --git a/methods/disk.desc.mounted b/methods/disk/desc.mounted similarity index 100% rename from methods/disk.desc.mounted rename to methods/disk/desc.mounted diff --git a/methods/disk.desc.nfs b/methods/disk/desc.nfs similarity index 100% rename from methods/disk.desc.nfs rename to methods/disk/desc.nfs diff --git a/methods/disk.install b/methods/disk/install old mode 100644 new mode 100755 similarity index 100% rename from methods/disk.install rename to methods/disk/install diff --git a/methods/disk.names b/methods/disk/names similarity index 100% rename from methods/disk.names rename to methods/disk/names diff --git a/methods/disk.setup b/methods/disk/setup old mode 100644 new mode 100755 similarity index 99% rename from methods/disk.setup rename to methods/disk/setup index 815b21a8..be3b5650 --- a/methods/disk.setup +++ b/methods/disk/setup @@ -8,7 +8,7 @@ option=$3 cd "$vardir/methods/disk" tp=/var/run/ddm$$ -iarch=`dpkg --admindir $vardir --print-installation-architecture` +iarch=`dpkg --admindir $vardir --print-architecture` xit=1 trap ' diff --git a/methods/disk.update b/methods/disk/update old mode 100644 new mode 100755 similarity index 95% rename from methods/disk.update rename to methods/disk/update index 4a90ed19..9d917230 --- a/methods/disk.update +++ b/methods/disk/update @@ -22,7 +22,7 @@ fi xit=1 trap ' - rm -f packages-{main,ctb,nf,nus,lcl} + rm -f packages-main packages-ctb packages-nf packages-nus packages-lcl if [ -n "$umount" ] then umount "$umount" >/dev/null 2>&1 diff --git a/methods/floppy.desc.floppy b/methods/floppy/desc.floppy similarity index 100% rename from methods/floppy.desc.floppy rename to methods/floppy/desc.floppy diff --git a/methods/floppy.install b/methods/floppy/install old mode 100644 new mode 100755 similarity index 100% rename from methods/floppy.install rename to methods/floppy/install diff --git a/methods/floppy.names b/methods/floppy/names similarity index 100% rename from methods/floppy.names rename to methods/floppy/names diff --git a/methods/floppy.setup b/methods/floppy/setup old mode 100644 new mode 100755 similarity index 100% rename from methods/floppy.setup rename to methods/floppy/setup diff --git a/methods/floppy.update b/methods/floppy/update old mode 100644 new mode 100755 similarity index 100% rename from methods/floppy.update rename to methods/floppy/update diff --git a/methods/hd.setup b/methods/hd.setup deleted file mode 100644 index 906ccbce..00000000 --- a/methods/hd.setup +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/perl -# -# Copyright (C) 1994 Carl Streeter -# -# this script 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 script 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 script; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -$vardir = $ARGV[0]; -print "Is the partition to install from mounted? [Y] "; -$ans = ; -if ($ans =~ /^[Nn]/) { - do { - do { - print "Which device should I mount? /dev/"; - $drive = ; - chop $drive; - $drive =~ tr/[A-Z]/[a-z]/; - } while (! -b "/dev/$drive"); - - $mpoint = "/mnt"; - do { - print "Where should I mount it? (Please use full path) [$mpoint] "; - $newmp = ; - chop $newmp; - $mpoint = $newmp if ($newmp !~ /^$/); - } while (($mpoint !~ ?^/?) || (! -d $mpoint)); - - print "These filesystems are available:"; - open(FILESYS, ") { - next if /^nodev/; - chop; - /(\w+)/; - $systems .= "$1 "; - } - print "$systems\n"; - do { - print "What filesystem is the partition to mount? [ext2] "; - $filesys = ; - chop $filesys; - $filesys = "ext2" if ($filesys =~ /^$/); - $filesys =~ tr/[A-Z]/[a-z]/; - } while ($systems !~ /\s$filesys\s/); - - do { - print "Any other options for mount? "; - print "(eg. '-o ro' for cdrom, must start with '-') [] "; - $opts = ; - chop $opts; - } while ($opts !~ /^$/ && $opts !~ /^\-/); - - $command = "/bin/mount -t $filesys $opts /dev/$drive $mpoint"; - print "I will now run \"$command\"\n"; - # system("$command"); - } while ($?); -} # I never knew how hard I could make it to mount a drive. - -# Assumedly, the drive is now mounted - -open (STATUS, ">$vardir/methods/hd/hd.status") || die "Can't open hd.status"; -do { - print "What is the full path to the 'available' file?\n"; - print "This file is found as Packages on the ftp site and CDROM"; - print "Use 'none' if you don't have one."; - $avail = ; - chop $avail; -} while (! -f $avail || $avail !~ ?^/? || $avail !~ /none/); - -do{ - print "What is the full path to the base directory "; - print "containing the .deb packages?\n"; - $debpath = ; - chop $debpath; -} while(! -d $debpath || $debpath !~ ?^/?); - -print STATUS "AVAIL: $avail\n"; -print STATUS "DEBDIR: $debpath\n"; -close (STATUS); -exit (0); diff --git a/methods/hd.unpack b/methods/hd.unpack deleted file mode 100644 index ca5a8fd4..00000000 --- a/methods/hd.unpack +++ /dev/null @@ -1,37 +0,0 @@ -# Return associative array of fields from control file $file. -$vardir = $ARGV[0]; -sub slurp -{ - local ($file) = @_; - local (%controlinfo); - local (%ci); - - open (CONTROL, $file) || return 1; - - # Get entire text of control file. - undef $/; $* = 1; $_ = ; - - # Join lines. - s/\n[ \t]+/ /g; - - # Split on fields. - %controlinfo = ('PRESTUFF', split (/^(\S+):\s*/)); - - $/ = "\n"; $* = 0; - foreach $key (keys %controlinfo) - { - $key2 = $key; $key2 =~ y/A-Z/a-z/; - chop ($controlinfo{$key}) if (/\n/); - $ci{$key2} = $controlinfo{$key}; - } - - return %ci; -} - -$file = "$vardir/methods/hd/hd.status"; -%info = slurp($file); -$dpkg = "dpkg --admindir $vardir --auto --unpack --no-auto-select "; -$dpkg .= "--refuse downgrade --skip-same-version"; - -system("$dpkg $info{'debdir'}"); - diff --git a/methods/hd.update b/methods/hd.update deleted file mode 100644 index 2a277dd8..00000000 --- a/methods/hd.update +++ /dev/null @@ -1,38 +0,0 @@ -# Return associative array of fields from control file $file. -$vardir = $ARGV[0]; -sub slurp -{ - local ($file) = @_; - local (%controlinfo); - local (%ci); - - open (CONTROL, $file) || return 1; - - # Get entire text of control file. - undef $/; $* = 1; $_ = ; - - # Join lines. - s/\n[ \t]+/ /g; - - # Split on fields. - %controlinfo = ('PRESTUFF', split (/^(\S+):\s*/)); - - $/ = "\n"; $* = 0; - foreach $key (keys %controlinfo) - { - $key2 = $key; $key2 =~ y/A-Z/a-z/; - chop ($controlinfo{$key}) if (/\n/); - $ci{$key2} = $controlinfo{$key}; - } - - return %ci; -} - -$file = "$vardir/methods/hd/hd.status"; -%info = slurp($file); -open (IN, "<$info{'avail'}") || die "can't open $info{'avail'}"; -open (OUT, ">$vardir/available") || die "can't open $vardir/available"; -print OUT while (); -close IN; -close OUT; - diff --git a/missing b/missing new file mode 100755 index 00000000..e7ef83a1 --- /dev/null +++ b/missing @@ -0,0 +1,360 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2003-09-02.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# 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 +# 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. + +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 + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; +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) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +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' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + 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] + +Send bug reports to ." + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + 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 + ;; + + autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + 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_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*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + 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$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. 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 $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + fi + 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 "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && 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 is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/mkinstalldirs b/mkinstalldirs index 6fbe5e11..d2d5f21b 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -1,32 +1,20 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy - -scriptversion=2004-02-15.20 - -# Original author: Noah Friedman +# Author: Noah Friedman # Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . +# Public domain errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" + echo "$usage" 1>&2 exit 0 ;; -m) # -m PERM arg @@ -35,10 +23,6 @@ while test $# -gt 0 ; do dirmode=$1 shift ;; - --version) - echo "$0 $scriptversion" - exit 0 - ;; --) # stop option processing shift break @@ -66,37 +50,17 @@ case $# in 0) exit 0 ;; esac -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + if mkdir -p -- . 2>/dev/null; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done fi ;; esac @@ -120,17 +84,17 @@ do mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -143,8 +107,5 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" # End: +# mkinstalldirs ends here diff --git a/optlib/Makefile b/optlib/Makefile deleted file mode 100644 index 2ff8d2a6..00000000 --- a/optlib/Makefile +++ /dev/null @@ -1,31 +0,0 @@ - -srcdir = . -top_srcdir = .. - -default: all -include ../Makefile.conf - -SOURCES = getopt.c getopt1.c long-options.c closeout.c obstack.c - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) libopt.a - -.PHONY: all -all:: libopt.a - -libopt.a: $(OBJECTS) - $(AR) r $@ $^ - $(RANLIB) $@ - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - diff --git a/optlib/Makefile.in b/optlib/Makefile.in deleted file mode 100644 index bbaa8061..00000000 --- a/optlib/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ - -default: all -include ../Makefile.conf - -SOURCES = getopt.c getopt1.c long-options.c closeout.c obstack.c - -OBJECTS = $(patsubst %.c, %.o, $(SOURCES)) -GENFILES = $(OBJECTS) libopt.a - -.PHONY: all -all:: libopt.a - -libopt.a: $(OBJECTS) - $(AR) r $@ $^ - $(RANLIB) $@ - -.PHONY: install -install:: all - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile - diff --git a/optlib/getdate.c b/optlib/getdate.c deleted file mode 100644 index 1b12c3a8..00000000 --- a/optlib/getdate.c +++ /dev/null @@ -1,2006 +0,0 @@ - -/* A Bison parser, made from getdate.y - by GNU Bison version 1.25 - */ - -#define YYBISON 1 /* Identify Bison output. */ - -#define tAGO 258 -#define tDAY 259 -#define tDAY_UNIT 260 -#define tDAYZONE 261 -#define tDST 262 -#define tHOUR_UNIT 263 -#define tID 264 -#define tMERIDIAN 265 -#define tMINUTE_UNIT 266 -#define tMONTH 267 -#define tMONTH_UNIT 268 -#define tSEC_UNIT 269 -#define tSNUMBER 270 -#define tUNUMBER 271 -#define tYEAR_UNIT 272 -#define tZONE 273 - -#line 1 "getdate.y" - -/* -** Originally written by Steven M. Bellovin while -** at the University of North Carolina at Chapel Hill. Later tweaked by -** a couple of people on Usenet. Completely overhauled by Rich $alz -** and Jim Berets in August, 1990; -** -** This grammar has 13 shift/reduce conflicts. -** -** This code is in the public domain and has no copyright. -*/ - -#ifdef HAVE_CONFIG_H -# include -# ifdef FORCE_ALLOCA_H -# include -# endif -#endif - -/* Since the code of getdate.y is not included in the Emacs executable - itself, there is no need to #define static in this file. Even if - the code were included in the Emacs executable, it probably - wouldn't do any harm to #undef it here; this will only cause - problems if we try to write to a static variable, which I don't - think this code needs to do. */ -#ifdef emacs -# undef static -#endif - -#include -#include - -#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) isascii(c) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) -#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) -#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) -#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) - -/* ISDIGIT differs from ISDIGIT_LOCALE, as follows: - - Its arg may be any int or unsigned int; it need not be an unsigned char. - - It's guaranteed to evaluate its argument exactly once. - - It's typically faster. - Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that - only '0' through '9' are digits. Prefer ISDIGIT to ISDIGIT_LOCALE unless - it's important to use the locale's definition of `digit' even when the - host does not conform to Posix. */ -#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) - -#include "getdate.h" - -#if defined (STDC_HEADERS) || defined (USG) -# include -#endif - -/* Some old versions of bison generate parsers that use bcopy. - That loses on systems that don't provide the function, so we have - to redefine it here. */ -#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy) -# define bcopy(from, to, len) memcpy ((to), (from), (len)) -#endif - -extern struct tm *gmtime (); -extern struct tm *localtime (); -extern time_t mktime (); - -/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc), - as well as gratuitiously global symbol names, so we can have multiple - yacc generated parsers in the same program. Note that these are only - the variables produced by yacc. If other parser generators (bison, - byacc, etc) produce additional global names that conflict at link time, - then those parser generators need to be fixed instead of adding those - names to this list. */ - -#define yymaxdepth gd_maxdepth -#define yyparse gd_parse -#define yylex gd_lex -#define yyerror gd_error -#define yylval gd_lval -#define yychar gd_char -#define yydebug gd_debug -#define yypact gd_pact -#define yyr1 gd_r1 -#define yyr2 gd_r2 -#define yydef gd_def -#define yychk gd_chk -#define yypgo gd_pgo -#define yyact gd_act -#define yyexca gd_exca -#define yyerrflag gd_errflag -#define yynerrs gd_nerrs -#define yyps gd_ps -#define yypv gd_pv -#define yys gd_s -#define yy_yys gd_yys -#define yystate gd_state -#define yytmp gd_tmp -#define yyv gd_v -#define yy_yyv gd_yyv -#define yyval gd_val -#define yylloc gd_lloc -#define yyreds gd_reds /* With YYDEBUG defined */ -#define yytoks gd_toks /* With YYDEBUG defined */ -#define yylhs gd_yylhs -#define yylen gd_yylen -#define yydefred gd_yydefred -#define yydgoto gd_yydgoto -#define yysindex gd_yysindex -#define yyrindex gd_yyrindex -#define yygindex gd_yygindex -#define yytable gd_yytable -#define yycheck gd_yycheck - -static int yylex (); -static int yyerror (); - -#define EPOCH 1970 -#define HOUR(x) ((x) * 60) - -#define MAX_BUFF_LEN 128 /* size of buffer to read the date into */ - -/* -** An entry in the lexical lookup table. -*/ -typedef struct _TABLE { - const char *name; - int type; - int value; -} TABLE; - - -/* -** Meridian: am, pm, or 24-hour style. -*/ -typedef enum _MERIDIAN { - MERam, MERpm, MER24 -} MERIDIAN; - - -/* -** Global variables. We could get rid of most of these by using a good -** union as the yacc stack. (This routine was originally written before -** yacc had the %union construct.) Maybe someday; right now we only use -** the %union very rarely. -*/ -static const char *yyInput; -static int yyDayOrdinal; -static int yyDayNumber; -static int yyHaveDate; -static int yyHaveDay; -static int yyHaveRel; -static int yyHaveTime; -static int yyHaveZone; -static int yyTimezone; -static int yyDay; -static int yyHour; -static int yyMinutes; -static int yyMonth; -static int yySeconds; -static int yyYear; -static MERIDIAN yyMeridian; -static int yyRelDay; -static int yyRelHour; -static int yyRelMinutes; -static int yyRelMonth; -static int yyRelSeconds; -static int yyRelYear; - - -#line 175 "getdate.y" -typedef union { - int Number; - enum _MERIDIAN Meridian; -} YYSTYPE; -#include - -#ifndef __cplusplus -#ifndef __STDC__ -#define const -#endif -#endif - - - -#define YYFINAL 61 -#define YYFLAG -32768 -#define YYNTBASE 22 - -#define YYTRANSLATE(x) ((unsigned)(x) <= 273 ? yytranslate[x] : 32) - -static const char yytranslate[] = { 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 20, 2, 2, 21, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 19, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18 -}; - -#if YYDEBUG != 0 -static const short yyprhs[] = { 0, - 0, 1, 4, 6, 8, 10, 12, 14, 16, 19, - 24, 29, 36, 43, 45, 47, 50, 52, 55, 58, - 62, 68, 72, 76, 79, 84, 87, 91, 94, 96, - 99, 102, 104, 107, 110, 112, 115, 118, 120, 123, - 126, 128, 131, 134, 136, 139, 142, 144, 146, 147 -}; - -static const short yyrhs[] = { -1, - 22, 23, 0, 24, 0, 25, 0, 27, 0, 26, - 0, 28, 0, 30, 0, 16, 10, 0, 16, 19, - 16, 31, 0, 16, 19, 16, 15, 0, 16, 19, - 16, 19, 16, 31, 0, 16, 19, 16, 19, 16, - 15, 0, 18, 0, 6, 0, 18, 7, 0, 4, - 0, 4, 20, 0, 16, 4, 0, 16, 21, 16, - 0, 16, 21, 16, 21, 16, 0, 16, 15, 15, - 0, 16, 12, 15, 0, 12, 16, 0, 12, 16, - 20, 16, 0, 16, 12, 0, 16, 12, 16, 0, - 29, 3, 0, 29, 0, 16, 17, 0, 15, 17, - 0, 17, 0, 16, 13, 0, 15, 13, 0, 13, - 0, 16, 5, 0, 15, 5, 0, 5, 0, 16, - 8, 0, 15, 8, 0, 8, 0, 16, 11, 0, - 15, 11, 0, 11, 0, 16, 14, 0, 15, 14, - 0, 14, 0, 16, 0, 0, 10, 0 -}; - -#endif - -#if YYDEBUG != 0 -static const short yyrline[] = { 0, - 191, 192, 195, 198, 201, 204, 207, 210, 213, 219, - 225, 234, 240, 252, 255, 258, 264, 268, 272, 278, - 282, 300, 306, 312, 316, 321, 325, 332, 340, 343, - 346, 349, 352, 355, 358, 361, 364, 367, 370, 373, - 376, 379, 382, 385, 388, 391, 394, 399, 432, 436 -}; -#endif - - -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) - -static const char * const yytname[] = { "$","error","$undefined.","tAGO","tDAY", -"tDAY_UNIT","tDAYZONE","tDST","tHOUR_UNIT","tID","tMERIDIAN","tMINUTE_UNIT", -"tMONTH","tMONTH_UNIT","tSEC_UNIT","tSNUMBER","tUNUMBER","tYEAR_UNIT","tZONE", -"':'","','","'/'","spec","item","time","zone","day","date","rel","relunit","number", -"o_merid", NULL -}; -#endif - -static const short yyr1[] = { 0, - 22, 22, 23, 23, 23, 23, 23, 23, 24, 24, - 24, 24, 24, 25, 25, 25, 26, 26, 26, 27, - 27, 27, 27, 27, 27, 27, 27, 28, 28, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 30, 31, 31 -}; - -static const short yyr2[] = { 0, - 0, 2, 1, 1, 1, 1, 1, 1, 2, 4, - 4, 6, 6, 1, 1, 2, 1, 2, 2, 3, - 5, 3, 3, 2, 4, 2, 3, 2, 1, 2, - 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, - 1, 2, 2, 1, 2, 2, 1, 1, 0, 1 -}; - -static const short yydefact[] = { 1, - 0, 17, 38, 15, 41, 44, 0, 35, 47, 0, - 48, 32, 14, 2, 3, 4, 6, 5, 7, 29, - 8, 18, 24, 37, 40, 43, 34, 46, 31, 19, - 36, 39, 9, 42, 26, 33, 45, 0, 30, 0, - 0, 16, 28, 0, 23, 27, 22, 49, 20, 25, - 50, 11, 0, 10, 0, 49, 21, 13, 12, 0, - 0 -}; - -static const short yydefgoto[] = { 1, - 14, 15, 16, 17, 18, 19, 20, 21, 54 -}; - -static const short yypact[] = {-32768, - 0, -19,-32768,-32768,-32768,-32768, -13,-32768,-32768, 30, - 15,-32768, 14,-32768,-32768,-32768,-32768,-32768,-32768, 19, --32768,-32768, 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, -6,-32768,-32768, 16,-32768, 17, - 23,-32768,-32768, 24,-32768,-32768,-32768, 27, 28,-32768, --32768,-32768, 29,-32768, 32, -8,-32768,-32768,-32768, 50, --32768 -}; - -static const short yypgoto[] = {-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -5 -}; - - -#define YYLAST 51 - - -static const short yytable[] = { 60, - 22, 51, 23, 2, 3, 4, 58, 5, 45, 46, - 6, 7, 8, 9, 10, 11, 12, 13, 30, 31, - 42, 43, 32, 44, 33, 34, 35, 36, 37, 38, - 47, 39, 48, 40, 24, 41, 51, 25, 49, 50, - 26, 52, 27, 28, 56, 53, 29, 57, 55, 61, - 59 -}; - -static const short yycheck[] = { 0, - 20, 10, 16, 4, 5, 6, 15, 8, 15, 16, - 11, 12, 13, 14, 15, 16, 17, 18, 4, 5, - 7, 3, 8, 20, 10, 11, 12, 13, 14, 15, - 15, 17, 16, 19, 5, 21, 10, 8, 16, 16, - 11, 15, 13, 14, 16, 19, 17, 16, 21, 0, - 56 -}; -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/p/share/bison.simple" - -/* Skeleton output parser for bison, - Copyright (C) 1984, 1989, 1990 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -#ifndef alloca -#ifdef __GNUC__ -#define alloca __builtin_alloca -#else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || defined (HAVE_ALLOCA_H) -#include -#else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) -#include -#else /* not MSDOS, or __TURBOC__ */ -#if defined(_AIX) -#include - #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); -}; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ -#endif /* __hpux */ -#endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ - -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -/* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action - as one case of the switch. */ - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 -#define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. - This remains here temporarily to ease the - transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define YYFAIL goto yyerrlab -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(token, value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { yychar = (token), yylval = (value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ - goto yybackup; \ - } \ - else \ - { yyerror ("syntax error: cannot back up"); YYERROR; } \ -while (0) - -#define YYTERROR 1 -#define YYERRCODE 256 - -#ifndef YYPURE -#define YYLEX yylex() -#endif - -#ifdef YYPURE -#ifdef YYLSP_NEEDED -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval, &yylloc) -#endif -#else /* not YYLSP_NEEDED */ -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* not YYLSP_NEEDED */ -#endif - -/* If nonreentrant, generate the variables here */ - -#ifndef YYPURE - -int yychar; /* the lookahead symbol */ -YYSTYPE yylval; /* the semantic value of the */ - /* lookahead symbol */ - -#ifdef YYLSP_NEEDED -YYLTYPE yylloc; /* location data for the lookahead */ - /* symbol */ -#endif - -int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ - -#if YYDEBUG != 0 -int yydebug; /* nonzero means print parse trace */ -/* Since this is uninitialized, it does not stop multiple parsers - from coexisting. */ -#endif - -/* YYINITDEPTH indicates the initial size of the parser's stacks */ - -#ifndef YYINITDEPTH -#define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH is the maximum size the stacks can grow to - (effective only if the built-in stack extension method is used). */ - -#if YYMAXDEPTH == 0 -#undef YYMAXDEPTH -#endif - -#ifndef YYMAXDEPTH -#define YYMAXDEPTH 10000 -#endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#else /* not GNU C or C++ */ -#ifndef __cplusplus - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - int count; -{ - register char *f = from; - register char *t = to; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#else /* __cplusplus */ - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, int count) -{ - register char *t = to; - register char *f = from; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -#endif -#endif - -#line 196 "/p/share/bison.simple" - -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef YYPARSE_PARAM -#ifdef __cplusplus -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not __cplusplus */ -#define YYPARSE_PARAM_ARG YYPARSE_PARAM -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#endif /* not __cplusplus */ -#else /* not YYPARSE_PARAM */ -#define YYPARSE_PARAM_ARG -#define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ - -int -yyparse(YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - register int yystate; - register int yyn; - register short *yyssp; - register YYSTYPE *yyvsp; - int yyerrstatus; /* number of tokens to shift before error messages enabled */ - int yychar1 = 0; /* lookahead token as an internal (translated) token number */ - - short yyssa[YYINITDEPTH]; /* the state stack */ - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ - - short *yyss = yyssa; /* refer to the stacks thru separate pointers */ - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ - -#ifdef YYLSP_NEEDED - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -#define YYPOPSTACK (yyvsp--, yyssp--) -#endif - - int yystacksize = YYINITDEPTH; - -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#ifdef YYLSP_NEEDED - YYLTYPE yylloc; -#endif -#endif - - YYSTYPE yyval; /* the variable used to return */ - /* semantic values from the action */ - /* routines */ - - int yylen; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Starting parse\n"); -#endif - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss - 1; - yyvsp = yyvs; -#ifdef YYLSP_NEEDED - yylsp = yyls; -#endif - -/* Push a new state, which is found in yystate . */ -/* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. */ -yynewstate: - - *++yyssp = yystate; - - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack */ - /* Use copies of these so that the &'s don't force the real ones into memory. */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#ifdef YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; - -#ifdef yyoverflow - /* Each stack pointer address is followed by the size of - the data in use in that stack, in bytes. */ -#ifdef YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -#else - yyoverflow("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -#endif - - yyss = yyss1; yyvs = yyvs1; -#ifdef YYLSP_NEEDED - yyls = yyls1; -#endif -#else /* no yyoverflow */ - /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror("parser stack overflow"); - return 2; - } - yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) - yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); -#ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); -#endif -#endif /* no yyoverflow */ - - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#ifdef YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Stack size increased to %d\n", yystacksize); -#endif - - if (yyssp >= yyss + yystacksize - 1) - YYABORT; - } - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Entering state %d\n", yystate); -#endif - - goto yybackup; - yybackup: - -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - - if (yychar == YYEMPTY) - { -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Reading a token: "); -#endif - yychar = YYLEX; - } - - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ - { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Now at end of input.\n"); -#endif - } - else - { - yychar1 = YYTRANSLATE(yychar); - -#if YYDEBUG != 0 - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise meaning - of a token, for further debugging info. */ -#ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -#endif - fprintf (stderr, ")\n"); - } -#endif - } - - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) - goto yydefault; - - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); -#endif - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* count tokens shifted since error; after three, turn off error status. */ - if (yyerrstatus) yyerrstatus--; - - yystate = yyn; - goto yynewstate; - -/* Do the default action for the current state. */ -yydefault: - - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - -/* Do a reduction. yyn is the number of a rule to reduce with. */ -yyreduce: - yylen = yyr2[yyn]; - if (yylen > 0) - yyval = yyvsp[1-yylen]; /* implement default value of the action */ - -#if YYDEBUG != 0 - if (yydebug) - { - int i; - - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif - - - switch (yyn) { - -case 3: -#line 195 "getdate.y" -{ - yyHaveTime++; - ; - break;} -case 4: -#line 198 "getdate.y" -{ - yyHaveZone++; - ; - break;} -case 5: -#line 201 "getdate.y" -{ - yyHaveDate++; - ; - break;} -case 6: -#line 204 "getdate.y" -{ - yyHaveDay++; - ; - break;} -case 7: -#line 207 "getdate.y" -{ - yyHaveRel++; - ; - break;} -case 9: -#line 213 "getdate.y" -{ - yyHour = yyvsp[-1].Number; - yyMinutes = 0; - yySeconds = 0; - yyMeridian = yyvsp[0].Meridian; - ; - break;} -case 10: -#line 219 "getdate.y" -{ - yyHour = yyvsp[-3].Number; - yyMinutes = yyvsp[-1].Number; - yySeconds = 0; - yyMeridian = yyvsp[0].Meridian; - ; - break;} -case 11: -#line 225 "getdate.y" -{ - yyHour = yyvsp[-3].Number; - yyMinutes = yyvsp[-1].Number; - yyMeridian = MER24; - yyHaveZone++; - yyTimezone = (yyvsp[0].Number < 0 - ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60 - : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60)); - ; - break;} -case 12: -#line 234 "getdate.y" -{ - yyHour = yyvsp[-5].Number; - yyMinutes = yyvsp[-3].Number; - yySeconds = yyvsp[-1].Number; - yyMeridian = yyvsp[0].Meridian; - ; - break;} -case 13: -#line 240 "getdate.y" -{ - yyHour = yyvsp[-5].Number; - yyMinutes = yyvsp[-3].Number; - yySeconds = yyvsp[-1].Number; - yyMeridian = MER24; - yyHaveZone++; - yyTimezone = (yyvsp[0].Number < 0 - ? -yyvsp[0].Number % 100 + (-yyvsp[0].Number / 100) * 60 - : - (yyvsp[0].Number % 100 + (yyvsp[0].Number / 100) * 60)); - ; - break;} -case 14: -#line 252 "getdate.y" -{ - yyTimezone = yyvsp[0].Number; - ; - break;} -case 15: -#line 255 "getdate.y" -{ - yyTimezone = yyvsp[0].Number - 60; - ; - break;} -case 16: -#line 259 "getdate.y" -{ - yyTimezone = yyvsp[-1].Number - 60; - ; - break;} -case 17: -#line 264 "getdate.y" -{ - yyDayOrdinal = 1; - yyDayNumber = yyvsp[0].Number; - ; - break;} -case 18: -#line 268 "getdate.y" -{ - yyDayOrdinal = 1; - yyDayNumber = yyvsp[-1].Number; - ; - break;} -case 19: -#line 272 "getdate.y" -{ - yyDayOrdinal = yyvsp[-1].Number; - yyDayNumber = yyvsp[0].Number; - ; - break;} -case 20: -#line 278 "getdate.y" -{ - yyMonth = yyvsp[-2].Number; - yyDay = yyvsp[0].Number; - ; - break;} -case 21: -#line 282 "getdate.y" -{ - /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY. - The goal in recognizing YYYY/MM/DD is solely to support legacy - machine-generated dates like those in an RCS log listing. If - you want portability, use the ISO 8601 format. */ - if (yyvsp[-4].Number >= 1000) - { - yyYear = yyvsp[-4].Number; - yyMonth = yyvsp[-2].Number; - yyDay = yyvsp[0].Number; - } - else - { - yyMonth = yyvsp[-4].Number; - yyDay = yyvsp[-2].Number; - yyYear = yyvsp[0].Number; - } - ; - break;} -case 22: -#line 300 "getdate.y" -{ - /* ISO 8601 format. yyyy-mm-dd. */ - yyYear = yyvsp[-2].Number; - yyMonth = -yyvsp[-1].Number; - yyDay = -yyvsp[0].Number; - ; - break;} -case 23: -#line 306 "getdate.y" -{ - /* e.g. 17-JUN-1992. */ - yyDay = yyvsp[-2].Number; - yyMonth = yyvsp[-1].Number; - yyYear = -yyvsp[0].Number; - ; - break;} -case 24: -#line 312 "getdate.y" -{ - yyMonth = yyvsp[-1].Number; - yyDay = yyvsp[0].Number; - ; - break;} -case 25: -#line 316 "getdate.y" -{ - yyMonth = yyvsp[-3].Number; - yyDay = yyvsp[-2].Number; - yyYear = yyvsp[0].Number; - ; - break;} -case 26: -#line 321 "getdate.y" -{ - yyMonth = yyvsp[0].Number; - yyDay = yyvsp[-1].Number; - ; - break;} -case 27: -#line 325 "getdate.y" -{ - yyMonth = yyvsp[-1].Number; - yyDay = yyvsp[-2].Number; - yyYear = yyvsp[0].Number; - ; - break;} -case 28: -#line 332 "getdate.y" -{ - yyRelSeconds = -yyRelSeconds; - yyRelMinutes = -yyRelMinutes; - yyRelHour = -yyRelHour; - yyRelDay = -yyRelDay; - yyRelMonth = -yyRelMonth; - yyRelYear = -yyRelYear; - ; - break;} -case 30: -#line 343 "getdate.y" -{ - yyRelYear += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 31: -#line 346 "getdate.y" -{ - yyRelYear += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 32: -#line 349 "getdate.y" -{ - yyRelYear++; - ; - break;} -case 33: -#line 352 "getdate.y" -{ - yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 34: -#line 355 "getdate.y" -{ - yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 35: -#line 358 "getdate.y" -{ - yyRelMonth++; - ; - break;} -case 36: -#line 361 "getdate.y" -{ - yyRelDay += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 37: -#line 364 "getdate.y" -{ - yyRelDay += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 38: -#line 367 "getdate.y" -{ - yyRelDay++; - ; - break;} -case 39: -#line 370 "getdate.y" -{ - yyRelHour += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 40: -#line 373 "getdate.y" -{ - yyRelHour += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 41: -#line 376 "getdate.y" -{ - yyRelHour++; - ; - break;} -case 42: -#line 379 "getdate.y" -{ - yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 43: -#line 382 "getdate.y" -{ - yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 44: -#line 385 "getdate.y" -{ - yyRelMinutes++; - ; - break;} -case 45: -#line 388 "getdate.y" -{ - yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 46: -#line 391 "getdate.y" -{ - yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number; - ; - break;} -case 47: -#line 394 "getdate.y" -{ - yyRelSeconds++; - ; - break;} -case 48: -#line 400 "getdate.y" -{ - if (yyHaveTime && yyHaveDate && !yyHaveRel) - yyYear = yyvsp[0].Number; - else - { - if (yyvsp[0].Number>10000) - { - yyHaveDate++; - yyDay= (yyvsp[0].Number)%100; - yyMonth= (yyvsp[0].Number/100)%100; - yyYear = yyvsp[0].Number/10000; - } - else - { - yyHaveTime++; - if (yyvsp[0].Number < 100) - { - yyHour = yyvsp[0].Number; - yyMinutes = 0; - } - else - { - yyHour = yyvsp[0].Number / 100; - yyMinutes = yyvsp[0].Number % 100; - } - yySeconds = 0; - yyMeridian = MER24; - } - } - ; - break;} -case 49: -#line 433 "getdate.y" -{ - yyval.Meridian = MER24; - ; - break;} -case 50: -#line 437 "getdate.y" -{ - yyval.Meridian = yyvsp[0].Meridian; - ; - break;} -} - /* the action file gets copied in in place of this dollarsign */ -#line 498 "/p/share/bison.simple" - - yyvsp -= yylen; - yyssp -= yylen; -#ifdef YYLSP_NEEDED - yylsp -= yylen; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - - *++yyvsp = yyval; - -#ifdef YYLSP_NEEDED - yylsp++; - if (yylen == 0) - { - yylsp->first_line = yylloc.first_line; - yylsp->first_column = yylloc.first_column; - yylsp->last_line = (yylsp-1)->last_line; - yylsp->last_column = (yylsp-1)->last_column; - yylsp->text = 0; - } - else - { - yylsp->last_line = (yylsp+yylen-1)->last_line; - yylsp->last_column = (yylsp+yylen-1)->last_column; - } -#endif - - /* Now "shift" the result of the reduction. - Determine what state that goes to, - based on the state we popped back to - and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTBASE]; - - goto yynewstate; - -yyerrlab: /* here on detecting error */ - - if (! yyerrstatus) - /* If not already recovering from an error, report this error. */ - { - ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen(yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); - if (msg != 0) - { - strcpy(msg, "parse error"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof(yytname) / sizeof(char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, yytname[x]); - strcat(msg, "'"); - count++; - } - } - yyerror(msg); - free(msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror("parse error"); - } - - goto yyerrlab1; -yyerrlab1: /* here on error raised explicitly by an action */ - - if (yyerrstatus == 3) - { - /* if just tried and failed to reuse lookahead token after an error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); -#endif - - yychar = YYEMPTY; - } - - /* Else will try to reuse lookahead token - after shifting the error token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; - -yyerrdefault: /* current state does not do anything special for the error token. */ - -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ - if (yyn) goto yydefault; -#endif - -yyerrpop: /* pop the current state because it cannot handle the error token */ - - if (yyssp == yyss) YYABORT; - yyvsp--; - yystate = *--yyssp; -#ifdef YYLSP_NEEDED - yylsp--; -#endif - -#if YYDEBUG != 0 - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -yyerrhandle: - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; - - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrpop; - - if (yyn == YYFINAL) - YYACCEPT; - -#if YYDEBUG != 0 - if (yydebug) - fprintf(stderr, "Shifting error token, "); -#endif - - *++yyvsp = yylval; -#ifdef YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - yystate = yyn; - goto yynewstate; -} -#line 442 "getdate.y" - - -/* Month and day table. */ -static TABLE const MonthDayTable[] = { - { "january", tMONTH, 1 }, - { "february", tMONTH, 2 }, - { "march", tMONTH, 3 }, - { "april", tMONTH, 4 }, - { "may", tMONTH, 5 }, - { "june", tMONTH, 6 }, - { "july", tMONTH, 7 }, - { "august", tMONTH, 8 }, - { "september", tMONTH, 9 }, - { "sept", tMONTH, 9 }, - { "october", tMONTH, 10 }, - { "november", tMONTH, 11 }, - { "december", tMONTH, 12 }, - { "sunday", tDAY, 0 }, - { "monday", tDAY, 1 }, - { "tuesday", tDAY, 2 }, - { "tues", tDAY, 2 }, - { "wednesday", tDAY, 3 }, - { "wednes", tDAY, 3 }, - { "thursday", tDAY, 4 }, - { "thur", tDAY, 4 }, - { "thurs", tDAY, 4 }, - { "friday", tDAY, 5 }, - { "saturday", tDAY, 6 }, - { NULL } -}; - -/* Time units table. */ -static TABLE const UnitsTable[] = { - { "year", tYEAR_UNIT, 1 }, - { "month", tMONTH_UNIT, 1 }, - { "fortnight", tDAY_UNIT, 14 }, - { "week", tDAY_UNIT, 7 }, - { "day", tDAY_UNIT, 1 }, - { "hour", tHOUR_UNIT, 1 }, - { "minute", tMINUTE_UNIT, 1 }, - { "min", tMINUTE_UNIT, 1 }, - { "second", tSEC_UNIT, 1 }, - { "sec", tSEC_UNIT, 1 }, - { NULL } -}; - -/* Assorted relative-time words. */ -static TABLE const OtherTable[] = { - { "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 }, - { "yesterday", tMINUTE_UNIT, -1 * 24 * 60 }, - { "today", tMINUTE_UNIT, 0 }, - { "now", tMINUTE_UNIT, 0 }, - { "last", tUNUMBER, -1 }, - { "this", tMINUTE_UNIT, 0 }, - { "next", tUNUMBER, 2 }, - { "first", tUNUMBER, 1 }, -/* { "second", tUNUMBER, 2 }, */ - { "third", tUNUMBER, 3 }, - { "fourth", tUNUMBER, 4 }, - { "fifth", tUNUMBER, 5 }, - { "sixth", tUNUMBER, 6 }, - { "seventh", tUNUMBER, 7 }, - { "eighth", tUNUMBER, 8 }, - { "ninth", tUNUMBER, 9 }, - { "tenth", tUNUMBER, 10 }, - { "eleventh", tUNUMBER, 11 }, - { "twelfth", tUNUMBER, 12 }, - { "ago", tAGO, 1 }, - { NULL } -}; - -/* The timezone table. */ -static TABLE const TimezoneTable[] = { - { "gmt", tZONE, HOUR ( 0) }, /* Greenwich Mean */ - { "ut", tZONE, HOUR ( 0) }, /* Universal (Coordinated) */ - { "utc", tZONE, HOUR ( 0) }, - { "wet", tZONE, HOUR ( 0) }, /* Western European */ - { "bst", tDAYZONE, HOUR ( 0) }, /* British Summer */ - { "wat", tZONE, HOUR ( 1) }, /* West Africa */ - { "at", tZONE, HOUR ( 2) }, /* Azores */ -#if 0 - /* For completeness. BST is also British Summer, and GST is - * also Guam Standard. */ - { "bst", tZONE, HOUR ( 3) }, /* Brazil Standard */ - { "gst", tZONE, HOUR ( 3) }, /* Greenland Standard */ -#endif -#if 0 - { "nft", tZONE, HOUR (3.5) }, /* Newfoundland */ - { "nst", tZONE, HOUR (3.5) }, /* Newfoundland Standard */ - { "ndt", tDAYZONE, HOUR (3.5) }, /* Newfoundland Daylight */ -#endif - { "ast", tZONE, HOUR ( 4) }, /* Atlantic Standard */ - { "adt", tDAYZONE, HOUR ( 4) }, /* Atlantic Daylight */ - { "est", tZONE, HOUR ( 5) }, /* Eastern Standard */ - { "edt", tDAYZONE, HOUR ( 5) }, /* Eastern Daylight */ - { "cst", tZONE, HOUR ( 6) }, /* Central Standard */ - { "cdt", tDAYZONE, HOUR ( 6) }, /* Central Daylight */ - { "mst", tZONE, HOUR ( 7) }, /* Mountain Standard */ - { "mdt", tDAYZONE, HOUR ( 7) }, /* Mountain Daylight */ - { "pst", tZONE, HOUR ( 8) }, /* Pacific Standard */ - { "pdt", tDAYZONE, HOUR ( 8) }, /* Pacific Daylight */ - { "yst", tZONE, HOUR ( 9) }, /* Yukon Standard */ - { "ydt", tDAYZONE, HOUR ( 9) }, /* Yukon Daylight */ - { "hst", tZONE, HOUR (10) }, /* Hawaii Standard */ - { "hdt", tDAYZONE, HOUR (10) }, /* Hawaii Daylight */ - { "cat", tZONE, HOUR (10) }, /* Central Alaska */ - { "ahst", tZONE, HOUR (10) }, /* Alaska-Hawaii Standard */ - { "nt", tZONE, HOUR (11) }, /* Nome */ - { "idlw", tZONE, HOUR (12) }, /* International Date Line West */ - { "cet", tZONE, -HOUR (1) }, /* Central European */ - { "met", tZONE, -HOUR (1) }, /* Middle European */ - { "mewt", tZONE, -HOUR (1) }, /* Middle European Winter */ - { "mest", tDAYZONE, -HOUR (1) }, /* Middle European Summer */ - { "mesz", tDAYZONE, -HOUR (1) }, /* Middle European Summer */ - { "swt", tZONE, -HOUR (1) }, /* Swedish Winter */ - { "sst", tDAYZONE, -HOUR (1) }, /* Swedish Summer */ - { "fwt", tZONE, -HOUR (1) }, /* French Winter */ - { "fst", tDAYZONE, -HOUR (1) }, /* French Summer */ - { "eet", tZONE, -HOUR (2) }, /* Eastern Europe, USSR Zone 1 */ - { "bt", tZONE, -HOUR (3) }, /* Baghdad, USSR Zone 2 */ -#if 0 - { "it", tZONE, -HOUR (3.5) },/* Iran */ -#endif - { "zp4", tZONE, -HOUR (4) }, /* USSR Zone 3 */ - { "zp5", tZONE, -HOUR (5) }, /* USSR Zone 4 */ -#if 0 - { "ist", tZONE, -HOUR (5.5) },/* Indian Standard */ -#endif - { "zp6", tZONE, -HOUR (6) }, /* USSR Zone 5 */ -#if 0 - /* For completeness. NST is also Newfoundland Standard, and SST is - * also Swedish Summer. */ - { "nst", tZONE, -HOUR (6.5) },/* North Sumatra */ - { "sst", tZONE, -HOUR (7) }, /* South Sumatra, USSR Zone 6 */ -#endif /* 0 */ - { "wast", tZONE, -HOUR (7) }, /* West Australian Standard */ - { "wadt", tDAYZONE, -HOUR (7) }, /* West Australian Daylight */ -#if 0 - { "jt", tZONE, -HOUR (7.5) },/* Java (3pm in Cronusland!) */ -#endif - { "cct", tZONE, -HOUR (8) }, /* China Coast, USSR Zone 7 */ - { "jst", tZONE, -HOUR (9) }, /* Japan Standard, USSR Zone 8 */ -#if 0 - { "cast", tZONE, -HOUR (9.5) },/* Central Australian Standard */ - { "cadt", tDAYZONE, -HOUR (9.5) },/* Central Australian Daylight */ -#endif - { "east", tZONE, -HOUR (10) }, /* Eastern Australian Standard */ - { "eadt", tDAYZONE, -HOUR (10) }, /* Eastern Australian Daylight */ - { "gst", tZONE, -HOUR (10) }, /* Guam Standard, USSR Zone 9 */ - { "nzt", tZONE, -HOUR (12) }, /* New Zealand */ - { "nzst", tZONE, -HOUR (12) }, /* New Zealand Standard */ - { "nzdt", tDAYZONE, -HOUR (12) }, /* New Zealand Daylight */ - { "idle", tZONE, -HOUR (12) }, /* International Date Line East */ - { NULL } -}; - -/* Military timezone table. */ -static TABLE const MilitaryTable[] = { - { "a", tZONE, HOUR ( 1) }, - { "b", tZONE, HOUR ( 2) }, - { "c", tZONE, HOUR ( 3) }, - { "d", tZONE, HOUR ( 4) }, - { "e", tZONE, HOUR ( 5) }, - { "f", tZONE, HOUR ( 6) }, - { "g", tZONE, HOUR ( 7) }, - { "h", tZONE, HOUR ( 8) }, - { "i", tZONE, HOUR ( 9) }, - { "k", tZONE, HOUR ( 10) }, - { "l", tZONE, HOUR ( 11) }, - { "m", tZONE, HOUR ( 12) }, - { "n", tZONE, HOUR (- 1) }, - { "o", tZONE, HOUR (- 2) }, - { "p", tZONE, HOUR (- 3) }, - { "q", tZONE, HOUR (- 4) }, - { "r", tZONE, HOUR (- 5) }, - { "s", tZONE, HOUR (- 6) }, - { "t", tZONE, HOUR (- 7) }, - { "u", tZONE, HOUR (- 8) }, - { "v", tZONE, HOUR (- 9) }, - { "w", tZONE, HOUR (-10) }, - { "x", tZONE, HOUR (-11) }, - { "y", tZONE, HOUR (-12) }, - { "z", tZONE, HOUR ( 0) }, - { NULL } -}; - - - - -/* ARGSUSED */ -static int -yyerror (s) - char *s; -{ - return 0; -} - -static int -ToHour (Hours, Meridian) - int Hours; - MERIDIAN Meridian; -{ - switch (Meridian) - { - case MER24: - if (Hours < 0 || Hours > 23) - return -1; - return Hours; - case MERam: - if (Hours < 1 || Hours > 12) - return -1; - if (Hours == 12) - Hours = 0; - return Hours; - case MERpm: - if (Hours < 1 || Hours > 12) - return -1; - if (Hours == 12) - Hours = 0; - return Hours + 12; - default: - abort (); - } - /* NOTREACHED */ -} - -static int -ToYear (Year) - int Year; -{ - if (Year < 0) - Year = -Year; - - /* XPG4 suggests that years 00-68 map to 2000-2068, and - years 69-99 map to 1969-1999. */ - if (Year < 69) - Year += 2000; - else if (Year < 100) - Year += 1900; - - return Year; -} - -static int -LookupWord (buff) - char *buff; -{ - register char *p; - register char *q; - register const TABLE *tp; - int i; - int abbrev; - - /* Make it lowercase. */ - for (p = buff; *p; p++) - if (ISUPPER (*p)) - *p = tolower (*p); - - if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0) - { - yylval.Meridian = MERam; - return tMERIDIAN; - } - if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0) - { - yylval.Meridian = MERpm; - return tMERIDIAN; - } - - /* See if we have an abbreviation for a month. */ - if (strlen (buff) == 3) - abbrev = 1; - else if (strlen (buff) == 4 && buff[3] == '.') - { - abbrev = 1; - buff[3] = '\0'; - } - else - abbrev = 0; - - for (tp = MonthDayTable; tp->name; tp++) - { - if (abbrev) - { - if (strncmp (buff, tp->name, 3) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - } - else if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - } - - for (tp = TimezoneTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - - if (strcmp (buff, "dst") == 0) - return tDST; - - for (tp = UnitsTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - - /* Strip off any plural and try the units table again. */ - i = strlen (buff) - 1; - if (buff[i] == 's') - { - buff[i] = '\0'; - for (tp = UnitsTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - buff[i] = 's'; /* Put back for "this" in OtherTable. */ - } - - for (tp = OtherTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - - /* Military timezones. */ - if (buff[1] == '\0' && ISALPHA (*buff)) - { - for (tp = MilitaryTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - } - - /* Drop out any periods and try the timezone table again. */ - for (i = 0, p = q = buff; *q; q++) - if (*q != '.') - *p++ = *q; - else - i++; - *p = '\0'; - if (i) - for (tp = TimezoneTable; tp->name; tp++) - if (strcmp (buff, tp->name) == 0) - { - yylval.Number = tp->value; - return tp->type; - } - - return tID; -} - -static int -yylex () -{ - register char c; - register char *p; - char buff[20]; - int Count; - int sign; - - for (;;) - { - while (ISSPACE (*yyInput)) - yyInput++; - - if (ISDIGIT (c = *yyInput) || c == '-' || c == '+') - { - if (c == '-' || c == '+') - { - sign = c == '-' ? -1 : 1; - if (!ISDIGIT (*++yyInput)) - /* skip the '-' sign */ - continue; - } - else - sign = 0; - for (yylval.Number = 0; ISDIGIT (c = *yyInput++);) - yylval.Number = 10 * yylval.Number + c - '0'; - yyInput--; - if (sign < 0) - yylval.Number = -yylval.Number; - return sign ? tSNUMBER : tUNUMBER; - } - if (ISALPHA (c)) - { - for (p = buff; (c = *yyInput++, ISALPHA (c)) || c == '.';) - if (p < &buff[sizeof buff - 1]) - *p++ = c; - *p = '\0'; - yyInput--; - return LookupWord (buff); - } - if (c != '(') - return *yyInput++; - Count = 0; - do - { - c = *yyInput++; - if (c == '\0') - return c; - if (c == '(') - Count++; - else if (c == ')') - Count--; - } - while (Count > 0); - } -} - -#define TM_YEAR_ORIGIN 1900 - -/* Yield A - B, measured in seconds. */ -static long -difftm (a, b) - struct tm *a, *b; -{ - int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); - int by = b->tm_year + (TM_YEAR_ORIGIN - 1); - long days = ( - /* difference in day of year */ - a->tm_yday - b->tm_yday - /* + intervening leap days */ - + ((ay >> 2) - (by >> 2)) - - (ay / 100 - by / 100) - + ((ay / 100 >> 2) - (by / 100 >> 2)) - /* + difference in years * 365 */ - + (long) (ay - by) * 365 - ); - return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour)) - + (a->tm_min - b->tm_min)) - + (a->tm_sec - b->tm_sec)); -} - -time_t -get_date (p, now) - const char *p; - const time_t *now; -{ - struct tm tm, tm0, *tmp; - time_t Start; - - yyInput = p; - Start = now ? *now : time ((time_t *) NULL); - tmp = localtime (&Start); - yyYear = tmp->tm_year + TM_YEAR_ORIGIN; - yyMonth = tmp->tm_mon + 1; - yyDay = tmp->tm_mday; - yyHour = tmp->tm_hour; - yyMinutes = tmp->tm_min; - yySeconds = tmp->tm_sec; - yyMeridian = MER24; - yyRelSeconds = 0; - yyRelMinutes = 0; - yyRelHour = 0; - yyRelDay = 0; - yyRelMonth = 0; - yyRelYear = 0; - yyHaveDate = 0; - yyHaveDay = 0; - yyHaveRel = 0; - yyHaveTime = 0; - yyHaveZone = 0; - - if (yyparse () - || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 || yyHaveDay > 1) - return -1; - - tm.tm_year = ToYear (yyYear) - TM_YEAR_ORIGIN + yyRelYear; - tm.tm_mon = yyMonth - 1 + yyRelMonth; - tm.tm_mday = yyDay + yyRelDay; - if (yyHaveTime || (yyHaveRel && !yyHaveDate && !yyHaveDay)) - { - tm.tm_hour = ToHour (yyHour, yyMeridian); - if (tm.tm_hour < 0) - return -1; - tm.tm_min = yyMinutes; - tm.tm_sec = yySeconds; - } - else - { - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - } - tm.tm_hour += yyRelHour; - tm.tm_min += yyRelMinutes; - tm.tm_sec += yyRelSeconds; - tm.tm_isdst = -1; - tm0 = tm; - - Start = mktime (&tm); - - if (Start == (time_t) -1) - { - - /* Guard against falsely reporting errors near the time_t boundaries - when parsing times in other time zones. For example, if the min - time_t value is 1970-01-01 00:00:00 UTC and we are 8 hours ahead - of UTC, then the min localtime value is 1970-01-01 08:00:00; if - we apply mktime to 1970-01-01 00:00:00 we will get an error, so - we apply mktime to 1970-01-02 08:00:00 instead and adjust the time - zone by 24 hours to compensate. This algorithm assumes that - there is no DST transition within a day of the time_t boundaries. */ - if (yyHaveZone) - { - tm = tm0; - if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN) - { - tm.tm_mday++; - yyTimezone -= 24 * 60; - } - else - { - tm.tm_mday--; - yyTimezone += 24 * 60; - } - Start = mktime (&tm); - } - - if (Start == (time_t) -1) - return Start; - } - - if (yyHaveDay && !yyHaveDate) - { - tm.tm_mday += ((yyDayNumber - tm.tm_wday + 7) % 7 - + 7 * (yyDayOrdinal - (0 < yyDayOrdinal))); - Start = mktime (&tm); - if (Start == (time_t) -1) - return Start; - } - - if (yyHaveZone) - { - long delta = yyTimezone * 60L + difftm (&tm, gmtime (&Start)); - if ((Start + delta < Start) != (delta < 0)) - return -1; /* time_t overflow */ - Start += delta; - } - - return Start; -} - -#if defined (TEST) - -/* ARGSUSED */ -int -main (ac, av) - int ac; - char *av[]; -{ - char buff[MAX_BUFF_LEN + 1]; - time_t d; - - (void) printf ("Enter date, or blank line to exit.\n\t> "); - (void) fflush (stdout); - - buff[MAX_BUFF_LEN] = 0; - while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0]) - { - d = get_date (buff, (time_t *) NULL); - if (d == -1) - (void) printf ("Bad format - couldn't convert.\n"); - else - (void) printf ("%s", ctime (&d)); - (void) printf ("\t> "); - (void) fflush (stdout); - } - exit (0); - /* NOTREACHED */ -} -#endif /* defined (TEST) */ diff --git a/origins/Makefile.am b/origins/Makefile.am new file mode 100644 index 00000000..00f36258 --- /dev/null +++ b/origins/Makefile.am @@ -0,0 +1,10 @@ +## Process this file with automake to produce Makefile.in + +pkgconfdir = $(sysconfdir)/@PACKAGE@ +originsdir = $(pkgconfdir)/origins + +dist_origins_DATA = debian + + +install-data-local: + $(mkdir_p) $(DESTDIR)$(pkgdatadir)/origins diff --git a/origins/Makefile.in b/origins/Makefile.in new file mode 100644 index 00000000..14f53905 --- /dev/null +++ b/origins/Makefile.in @@ -0,0 +1,380 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = origins +DIST_COMMON = $(dist_origins_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__installdirs = "$(DESTDIR)$(originsdir)" +dist_originsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_origins_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +pkgconfdir = $(sysconfdir)/@PACKAGE@ +originsdir = $(pkgconfdir)/origins +dist_origins_DATA = debian +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu origins/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu origins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +install-dist_originsDATA: $(dist_origins_DATA) + @$(NORMAL_INSTALL) + test -z "$(originsdir)" || $(mkdir_p) "$(DESTDIR)$(originsdir)" + @list='$(dist_origins_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(dist_originsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(originsdir)/$$f'"; \ + $(dist_originsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(originsdir)/$$f"; \ + done + +uninstall-dist_originsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_origins_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(originsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(originsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(originsdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-data-local install-dist_originsDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_originsDATA uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dist_originsDATA 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 pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_originsDATA uninstall-info-am + + +install-data-local: + $(mkdir_p) $(DESTDIR)$(pkgdatadir)/origins +# 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/origin b/origins/debian similarity index 100% rename from origin rename to origins/debian diff --git a/po/ChangeLog b/po/ChangeLog index 2bec62f8..3af4c56e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,15 +1,158 @@ -2005-05-26 gettextize +2005-03-03 Arief S Fitrianto - * Makefile.in.in: Upgrade to gettext-0.14.2. + * id.po: First version. -2005-05-26 gettextize +2005-02-20 Konstantinos Margaritis - * Makefile.in.in: New file, from gettext-0.14.1. - * Rules-quot: New file, from gettext-0.14.1. - * boldquot.sed: New file, from gettext-0.14.1. - * en@boldquot.header: New file, from gettext-0.14.1. - * en@quot.header: New file, from gettext-0.14.1. - * insert-header.sin: New file, from gettext-0.14.1. - * quot.sed: New file, from gettext-0.14.1. - * remove-potcdate.sin: New file, from gettext-0.14.1. + * el.po: Updated again (complete) +2005-02-19 Konstantinos Margaritis + + * el.po: Updated + +2005-02-06 Carlos Liu + + * zh_CN.po: Updated + +2005-02-05 Jacobo Tarrio + + * gl.po: Updated + +2005-02-05 Asho Yeh + + * zh_TW.po: Updated + +2005-01-28 Seo Sanghyeon + + * ko.po: Completed + +2005-01-25 Christian Perrier + + * fr.po: Updated. + +2005-01-25 Bjorn Steensrud + + * nb.po: Add new Norwegian Bokmal translation. + +2005-01-11 Scott James Remnant + + * LINGUAS: Rather than just listing the language codes on one + line, put each on its own line with a preceeding comment giving + the English name for the language, the current translator's + name in their preferred form and a contact e-mail address. + +2005-01-11 Safir Å ećerović + + * bs.po: Add new Bosnian translation. + +2005-01-11 Jordi Mallach + + * ca.po: Updated. + +2005-01-11 Miroslav Kure + + * cs.po: Updated. + +2005-01-11 Claus Hindsgaul + + * da.po: Updated. + +2005-01-11 Michael Piefel + + * de.po: Updated. + +2005-01-11 George Papamichelakis + + * el.po: Updated. + +2005-01-11 Javier Fernández-Sanguino Peña + + * es.po: Updated. + +2005-01-11 Piarres Beobide + + * eu.po: Updated. + +2005-01-11 Christian Perrier + + * fr.po: Updated. + +2005-01-11 Héctor Fernández López + + * gl.po: Updated. + +2005-01-11 Lior Kaplan + + * he.po: Updated. + +2005-01-11 Stefano Canepa + + * it.po: Updated. + +2005-01-11 Kenshi Muto + + * ja.po: Updated. + +2005-01-11 Changwoo Ryu + + * ko.po: Updated. + +2005-01-11 Bart Cornelis + + * nl.po: Updated. + +2005-01-11 HÃ¥vard Korsvoll + + * nn.po: Updated. + +2005-01-11 Bartosz Feñski + + * pl.po: Updated. + +2005-01-11 Miguel Figueiredo + + * pt.po: Updated. + +2005-01-11 André Luís Lopes + + * pt_BR.po: Updated. + +2005-01-11 Yuri Kozlov + + * ru.po: Updated. + +2005-01-11 Roman Benko + + * sk.po: Add new Slovakian translation. + +2005-01-11 Peter Karlsson + + * sv.po: Updated. + +2005-01-11 Tchaikov + + * zh_CN.po: Updated. + +2005-01-11 Asho Yeh + + * zh_TW.po: Add new Traditional Chinese translation. + +2005-01-10 Scott James Remnant + + * POTFILES.in: Update with new file paths. + + * dpkg.pot: Remove from version control, it will be automatically + generated through gettext and automake. + * en.po: Remove needless english translation, the default strings + are in english. + * update.sh: Remove update script, files will be automatically + updated through gettext and automake. + + * LINGUAS: Store list of available translations in this file, which + is far easier to maintain than having to edit configure.in's + ALL_LINGUAS variable each time. + * Makevars: Updated against current gettext template, with copyright + changed to SPI and bugs address retained from previous version. + + +Older changes are documented in the top-level ChangeLog diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 00000000..fb7f4495 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,83 @@ +# This file contains the list of available translations. +# +# Each should be prefixed with the English name for the language and +# the current maintainer's name in their preferred form and contact +# e-mail address. + +# Bosnian - Safir Å ećerović +bs + +# Catalan - Jordi Mallach +ca + +# Czech - Miroslav Kure +cs + +# Danish - Claus Hindsgaul +da + +# German - Michael Piefel +de + +# Greek (Hellenic) - George Papamichelakis +el + +# Spanish - Javier Fernández-Sanguino Peña +es + +# Basque (Euskara) - Piarres Beobide Egaña +eu + +# French - Christian Perrier +fr + +# Galician - Héctor Fernández López +gl + +# Hebrew - Lior Kaplan +he + +# Indonesian - Arief S Fitrianto +id + +# Italian - Stefano Canepa +it + +# Japanese - Kenshi Muto +ja + +# Korean - Changwoo Ryu +ko + +# Norwegian (BokmÃ¥l) - Bjorn Steensrud +nb + +# Dutch - Bart Cornelis +nl + +# Norwegian (Nynorsk) - HÃ¥vard Korsvoll +nn + +# Polish - Bartosz Feñski +pl + +# Portuguese - Miguel Figueiredo +pt + +# Brazilian Portuguese - André Luís Lopes +pt_BR + +# Russian - Yuri Kozlov +ru + +# Slovak - Roman Benko +sk + +# Swedish - Peter Karlsson +sv + +# Simplified Chinese - Tchaikov +zh_CN + +# Traditional Chinese - Asho Yeh +zh_TW diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 76516c1a..53efc5e1 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,11 +8,10 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.14.2 +# Origin: gettext-0.14 PACKAGE = @PACKAGE@ VERSION = @VERSION@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ SHELL = /bin/sh @SET_MAKE@ @@ -101,16 +100,11 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ - msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ - else \ - msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ - fi; \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address="$$msgid_bugs_address" + --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ diff --git a/po/Makevars b/po/Makevars index ea01dedf..ee63eb77 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,9 +18,24 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = Free Software Foundation, Inc. +COPYRIGHT_HOLDER = Software in the Public Interest, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = debian-dpkg@lists.debian.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = -MSGID_BUGS_ADDRESS = debian-dpkg@lists.debian.org diff --git a/po/Makevars.template b/po/Makevars.template deleted file mode 100644 index 32692ab4..00000000 --- a/po/Makevars.template +++ /dev/null @@ -1,41 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Free Software Foundation, Inc. - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff --git a/po/POTFILES.in b/po/POTFILES.in index 7a259c44..3f3070dc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,48 +8,44 @@ lib/dump.c lib/ehandle.c lib/fields.c lib/lock.c +lib/md5.c lib/mlib.c lib/myopt.c +lib/nfmalloc.c lib/parse.c lib/parsehelp.c lib/showcright.c lib/showpkg.c +lib/star.c +lib/tarfn.c +lib/utils.c lib/varbuf.c +lib/vercmp.c -main/archives.c -main/cleanup.c -main/configure.c -main/depcon.c -main/enquiry.c -main/errors.c -main/filesdb.c -main/help.c -main/main.c -main/packages.c -main/processarc.c -main/remove.c -main/select.c -main/update.c - -main/query.c - -dpkg-deb/build.c -dpkg-deb/extract.c -dpkg-deb/info.c -dpkg-deb/main.c - -split/info.c -split/join.c -split/main.c -split/queue.c -split/split.c - -utils/md5sum.c +src/archives.c +src/cleanup.c +src/configure.c +src/depcon.c +src/enquiry.c +src/errors.c +src/filesdb.c +src/help.c +src/main.c +src/packages.c +src/processarc.c +src/query.c +src/remove.c +src/select.c +src/update.c dselect/basecmds.cc dselect/baselist.cc +dselect/basetop.cc dselect/bindings.cc +dselect/curkeys.cc +dselect/helpmsgs.cc dselect/main.cc +dselect/methkeys.cc dselect/methlist.cc dselect/method.cc dselect/methparse.cc @@ -57,8 +53,22 @@ dselect/pkgcmds.cc dselect/pkgdepcon.cc dselect/pkgdisplay.cc dselect/pkginfo.cc +dselect/pkgkeys.cc dselect/pkglist.cc dselect/pkgsublist.cc dselect/pkgtop.cc -dselect/helpmsgs.cc +dpkg-deb/build.c +dpkg-deb/extract.c +dpkg-deb/info.c +dpkg-deb/main.c + +dpkg-split/info.c +dpkg-split/join.c +dpkg-split/main.c +dpkg-split/queue.c +dpkg-split/split.c + +utils/enoent.c +utils/md5sum.c +utils/start-stop-daemon.c diff --git a/po/bs.gmo b/po/bs.gmo new file mode 100644 index 00000000..d2d23b38 Binary files /dev/null and b/po/bs.gmo differ diff --git a/po/bs.po b/po/bs.po index 27b858ef..1e895304 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: dpkg\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-26 17:21+0000\n" +"Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" +"POT-Creation-Date: 2005-03-03 12:14+0000\n" "PO-Revision-Date: 2004-11-27 01:29+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -853,369 +853,366 @@ msgstr "" msgid "failed to realloc for variable buffer" msgstr "" -#: main/archives.c:202 +#: src/archives.c:202 msgid "process_archive ... already disappeared !" msgstr "" -#: main/archives.c:222 +#: src/archives.c:222 msgid "error reading from dpkg-deb pipe" msgstr "" -#: main/archives.c:259 +#: src/archives.c:259 #, c-format msgid "error setting timestamps of `%.255s'" msgstr "" -#: main/archives.c:266 main/archives.c:513 +#: src/archives.c:266 src/archives.c:513 #, c-format msgid "error setting ownership of `%.255s'" msgstr "" -#: main/archives.c:268 main/archives.c:516 +#: src/archives.c:268 src/archives.c:516 #, c-format msgid "error setting permissions of `%.255s'" msgstr "" -#: main/archives.c:351 +#: src/archives.c:351 #, c-format msgid "" "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s" "%.100s%.10s" msgstr "" -#: main/archives.c:355 +#: src/archives.c:355 msgid " (package: " msgstr "" -#: main/archives.c:377 +#: src/archives.c:377 #, c-format msgid "unable to stat `%.255s' (which I was about to install)" msgstr "" -#: main/archives.c:385 +#: src/archives.c:385 #, c-format msgid "" "unable to clean up mess surrounding `%.255s' before installing another " "version" msgstr "" -#: main/archives.c:391 +#: src/archives.c:391 #, c-format msgid "unable to stat restored `%.255s' before installing another version" msgstr "" -#: main/archives.c:423 +#: src/archives.c:423 #, c-format msgid "archive contained object `%.255s' of unknown type 0x%x" msgstr "" -#: main/archives.c:454 +#: src/archives.c:454 #, c-format msgid "Replacing files in old package %s ...\n" msgstr "" -#: main/archives.c:458 +#: src/archives.c:458 #, c-format msgid "" "trying to overwrite directory `%.250s' in package %.250s with nondirectory" msgstr "" -#: main/archives.c:468 +#: src/archives.c:468 #, c-format msgid "trying to overwrite `%.250s', which is also in package %.250s" msgstr "" # Now that we have verified everything its time to actually # * build something. Lets start by making the ar-wrapper. -#. Now that we have verified everything its time to actually -#. * build something. Lets start by making the ar-wrapper. -#. -#: main/archives.c:496 dpkg-deb/build.c:314 +#: src/archives.c:496 dpkg-deb/build.c:314 #, c-format msgid "unable to create `%.255s'" msgstr "" -#: main/archives.c:501 +#: src/archives.c:501 #, c-format msgid "backend dpkg-deb during `%.255s'" msgstr "" -#: main/archives.c:519 +#: src/archives.c:519 #, c-format msgid "error closing/writing `%.255s'" msgstr "" -#: main/archives.c:524 +#: src/archives.c:524 #, c-format msgid "error creating pipe `%.255s'" msgstr "" -#: main/archives.c:530 main/archives.c:536 +#: src/archives.c:530 src/archives.c:536 #, c-format msgid "error creating device `%.255s'" msgstr "" -#: main/archives.c:545 +#: src/archives.c:545 #, c-format msgid "error creating hard link `%.255s'" msgstr "" -#: main/archives.c:552 +#: src/archives.c:552 #, c-format msgid "error creating symbolic link `%.255s'" msgstr "" -#: main/archives.c:561 +#: src/archives.c:561 #, c-format msgid "error setting ownership of symlink `%.255s'" msgstr "" -#: main/archives.c:566 +#: src/archives.c:566 #, c-format msgid "error creating directory `%.255s'" msgstr "" -#: main/archives.c:601 +#: src/archives.c:601 #, c-format msgid "unable to move aside `%.255s' to install new version" msgstr "" -#: main/archives.c:610 +#: src/archives.c:610 #, c-format msgid "unable to read link `%.255s'" msgstr "" -#: main/archives.c:614 +#: src/archives.c:614 #, c-format msgid "unable to make backup symlink for `%.255s'" msgstr "" -#: main/archives.c:620 +#: src/archives.c:620 #, c-format msgid "unable to chown backup symlink for `%.255s'" msgstr "" -#: main/archives.c:624 +#: src/archives.c:624 #, c-format msgid "unable to make backup link of `%.255s' before installing new version" msgstr "" -#: main/archives.c:630 +#: src/archives.c:630 #, c-format msgid "unable to install new version of `%.255s'" msgstr "" -#: main/archives.c:644 +#: src/archives.c:644 #, c-format msgid "" "dpkg: warning - ignoring dependency problem with removal of %s:\n" "%s" msgstr "" -#: main/archives.c:651 +#: src/archives.c:651 #, c-format msgid "" "dpkg: warning - considering deconfiguration of essential\n" " package %s, to enable removal of %s.\n" msgstr "" -#: main/archives.c:655 +#: src/archives.c:655 #, c-format msgid "" "dpkg: no, %s is essential, will not deconfigure\n" " it in order to enable removal of %s.\n" msgstr "" -#: main/archives.c:668 +#: src/archives.c:668 #, c-format msgid "" "dpkg: no, cannot remove %s (--auto-deconfigure will help):\n" "%s" msgstr "" -#: main/archives.c:702 +#: src/archives.c:702 #, c-format msgid "dpkg: considering removing %s in favour of %s ...\n" msgstr "" -#: main/archives.c:706 +#: src/archives.c:706 #, c-format msgid "%s is not properly installed - ignoring any dependencies on it.\n" msgstr "" -#: main/archives.c:733 +#: src/archives.c:733 #, c-format msgid "dpkg: may have trouble removing %s, as it provides %s ...\n" msgstr "" -#: main/archives.c:748 +#: src/archives.c:748 #, c-format msgid "" "dpkg: package %s requires reinstallation, but will remove anyway as you " "request.\n" msgstr "" -#: main/archives.c:751 +#: src/archives.c:751 #, c-format msgid "dpkg: package %s requires reinstallation, will not remove.\n" msgstr "" -#: main/archives.c:764 +#: src/archives.c:764 #, c-format msgid "dpkg: yes, will remove %s in favour of %s.\n" msgstr "" -#: main/archives.c:772 +#: src/archives.c:772 #, c-format msgid "" "dpkg: regarding %s containing %s:\n" "%s" msgstr "" -#: main/archives.c:775 +#: src/archives.c:775 #, c-format msgid "conflicting packages - not installing %.250s" msgstr "" -#: main/archives.c:776 +#: src/archives.c:776 #, c-format msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n" msgstr "" -#: main/archives.c:814 +#: src/archives.c:814 #, c-format msgid "--%s --recursive needs at least one path argument" msgstr "" -#: main/archives.c:844 +#: src/archives.c:844 msgid "failed to exec find for --recursive" msgstr "" -#: main/archives.c:849 +#: src/archives.c:849 msgid "failed to fdopen find's pipe" msgstr "" -#: main/archives.c:855 +#: src/archives.c:855 msgid "error reading find's pipe" msgstr "" -#: main/archives.c:856 +#: src/archives.c:856 msgid "error closing find's pipe" msgstr "" -#: main/archives.c:859 +#: src/archives.c:859 #, c-format msgid "find for --recursive returned unhandled error %i" msgstr "" -#: main/archives.c:862 +#: src/archives.c:862 msgid "searched, but found no packages (files matching *.deb)" msgstr "" -#: main/archives.c:878 +#: src/archives.c:878 #, c-format msgid "--%s needs at least one package archive file argument" msgstr "" -#: main/archives.c:948 +#: src/archives.c:948 #, c-format msgid "Selecting previously deselected package %s.\n" msgstr "" -#: main/archives.c:953 +#: src/archives.c:953 #, c-format msgid "Skipping deselected package %s.\n" msgstr "" -#: main/archives.c:967 +#: src/archives.c:967 #, c-format msgid "Version %.250s of %.250s already installed, skipping.\n" msgstr "" -#: main/archives.c:979 +#: src/archives.c:979 #, c-format msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n" msgstr "" -#: main/archives.c:985 +#: src/archives.c:985 #, c-format msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n" msgstr "" -#: main/cleanup.c:84 +#: src/cleanup.c:84 #, c-format msgid "" "unable to remove newly-installed version of `%.250s' to allow reinstallation " "of backup copy" msgstr "" -#: main/cleanup.c:91 +#: src/cleanup.c:91 #, c-format msgid "unable to restore backup version of `%.250s'" msgstr "" -#: main/cleanup.c:97 +#: src/cleanup.c:97 #, c-format msgid "unable to remove newly-extracted version of `%.250s'" msgstr "" -#: main/configure.c:87 +#: src/configure.c:90 #, c-format msgid "no package named `%s' is installed, cannot configure" msgstr "" -#: main/configure.c:89 +#: src/configure.c:92 #, c-format msgid "package %.250s is already installed and configured" msgstr "" -#: main/configure.c:91 +#: src/configure.c:94 #, c-format msgid "" "package %.250s is not ready for configuration\n" " cannot configure (current status `%.250s')" msgstr "" -#: main/configure.c:110 +#: src/configure.c:113 #, c-format msgid "" "dpkg: dependency problems prevent configuration of %s:\n" "%s" msgstr "" -#: main/configure.c:113 +#: src/configure.c:116 msgid "dependency problems - leaving unconfigured" msgstr "" -#: main/configure.c:117 +#: src/configure.c:120 #, c-format msgid "" "dpkg: %s: dependency problems, but configuring anyway as you request:\n" "%s" msgstr "" -#: main/configure.c:125 +#: src/configure.c:128 msgid "" "Package is in a very bad inconsistent state - you should\n" " reinstall it before attempting configuration." msgstr "" -#: main/configure.c:128 +#: src/configure.c:131 #, c-format msgid "Setting up %s (%s) ...\n" msgstr "" -#: main/configure.c:175 +#: src/configure.c:178 #, c-format msgid "unable to stat new dist conffile `%.250s'" msgstr "" -#: main/configure.c:185 main/configure.c:423 +#: src/configure.c:188 src/configure.c:426 #, c-format msgid "unable to stat current installed conffile `%.250s'" msgstr "" -#: main/configure.c:194 +#: src/configure.c:197 #, c-format msgid "" "\n" @@ -1223,128 +1220,123 @@ msgid "" "Installing new config file as you request.\n" msgstr "" -#: main/configure.c:226 +#: src/configure.c:229 #, c-format msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n" msgstr "" -#: main/configure.c:234 +#: src/configure.c:237 #, c-format msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n" msgstr "" -#: main/configure.c:242 +#: src/configure.c:245 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n" msgstr "" -#: main/configure.c:250 +#: src/configure.c:253 #, c-format msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n" msgstr "" -#: main/configure.c:255 +#: src/configure.c:258 #, c-format msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n" msgstr "" -#: main/configure.c:259 +#: src/configure.c:262 #, c-format msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n" msgstr "" -#: main/configure.c:263 +#: src/configure.c:266 #, c-format msgid "Installing new version of config file %s ...\n" msgstr "" -#: main/configure.c:267 +#: src/configure.c:270 #, c-format msgid "unable to install `%.250s' as `%.250s'" msgstr "" -#: main/configure.c:328 +#: src/configure.c:331 #, c-format msgid "" "dpkg: %s: warning - unable to stat config file `%s'\n" " (= `%s'): %s\n" msgstr "" -#: main/configure.c:339 +#: src/configure.c:342 #, c-format msgid "" "dpkg: %s: warning - config file `%s' is a circular link\n" " (= `%s')\n" msgstr "" -#: main/configure.c:352 +#: src/configure.c:355 #, c-format msgid "" "dpkg: %s: warning - unable to readlink conffile `%s'\n" " (= `%s'): %s\n" msgstr "" -#: main/configure.c:372 +#: src/configure.c:375 #, c-format msgid "" "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n" " (`%s' is a symlink to `%s')\n" msgstr "" -#: main/configure.c:385 +#: src/configure.c:388 #, c-format msgid "" "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%" "s')\n" msgstr "" -#: main/configure.c:403 +#: src/configure.c:406 msgid "md5hash" msgstr "" -#: main/configure.c:409 +#: src/configure.c:412 #, c-format msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n" msgstr "" -#: main/configure.c:427 +#: src/configure.c:430 #, c-format msgid "unable to change ownership of new dist conffile `%.250s'" msgstr "" -#: main/configure.c:430 +#: src/configure.c:433 #, c-format msgid "unable to set mode of new dist conffile `%.250s'" msgstr "" -#: main/configure.c:460 +#: src/configure.c:463 #, c-format msgid "failed to run %s (%.250s)" msgstr "" -#: main/configure.c:469 main/configure.c:507 +#: src/configure.c:472 src/configure.c:510 msgid "wait for shell failed" msgstr "" -#. Do not job control to suspend but fork and start a new shell -#. * instead. -#. -#. waitpid status -#. waitpid result -#: main/configure.c:489 +#: src/configure.c:492 msgid "Type `exit' when you're done.\n" msgstr "Ukucajte `exit' kada zavrÅ¡ite.\n" -#: main/configure.c:498 +#: src/configure.c:501 #, c-format msgid "failed to exec shell (%.250s)" msgstr "" -#: main/configure.c:510 +#: src/configure.c:513 msgid "Don't forget to foreground (`fg') this process when you're done !\n" msgstr "" -#: main/configure.c:529 +#: src/configure.c:553 #, c-format msgid "" "\n" @@ -1353,12 +1345,12 @@ msgstr "" "\n" "Konfiguracijska datoteka `%s'" -#: main/configure.c:531 +#: src/configure.c:555 #, c-format msgid " (actually `%s')" msgstr "" -#: main/configure.c:535 +#: src/configure.c:559 #, c-format msgid "" "\n" @@ -1366,51 +1358,51 @@ msgid "" " ==> File also in package provided by package maintainer.\n" msgstr "" -#: main/configure.c:540 +#: src/configure.c:564 #, c-format msgid "" "\n" " ==> Modified (by you or by a script) since installation.\n" msgstr "" -#: main/configure.c:541 +#: src/configure.c:565 #, c-format msgid "" "\n" " Not modified since installation.\n" msgstr "" -#: main/configure.c:544 +#: src/configure.c:568 #, c-format msgid " ==> Package distributor has shipped an updated version.\n" msgstr "" -#: main/configure.c:545 +#: src/configure.c:569 #, c-format msgid " Version in package is the same as at last installation.\n" msgstr "" -#: main/configure.c:552 +#: src/configure.c:576 #, c-format msgid " ==> Using new file as you requested.\n" msgstr "" -#: main/configure.c:556 +#: src/configure.c:580 #, c-format msgid " ==> Using current old file as you requested.\n" msgstr "" -#: main/configure.c:566 +#: src/configure.c:590 #, c-format msgid " ==> Keeping old config file as default.\n" msgstr "" -#: main/configure.c:570 +#: src/configure.c:594 #, c-format msgid " ==> Using new config file as default.\n" msgstr "" -#: main/configure.c:578 +#: src/configure.c:602 #, c-format msgid "" " What would you like to do about it ? Your options are:\n" @@ -1420,630 +1412,588 @@ msgid "" " Z : background this process to examine the situation\n" msgstr "" -#: main/configure.c:585 +#: src/configure.c:609 #, c-format msgid " The default action is to keep your current version.\n" msgstr "" -#: main/configure.c:587 +#: src/configure.c:611 #, c-format msgid " The default action is to install the new version.\n" msgstr "" -#: main/configure.c:593 +#: src/configure.c:617 msgid "[default=N]" msgstr "" -#: main/configure.c:594 +#: src/configure.c:618 msgid "[default=Y]" msgstr "" -#: main/configure.c:594 +#: src/configure.c:618 msgid "[no default]" msgstr "" -#: main/configure.c:597 +#: src/configure.c:621 msgid "error writing to stderr, discovered before conffile prompt" msgstr "" -#: main/configure.c:604 +#: src/configure.c:628 msgid "read error on stdin at conffile prompt" msgstr "" -#: main/configure.c:605 +#: src/configure.c:629 msgid "EOF on stdin at conffile prompt" msgstr "" -#: main/depcon.c:76 +#: src/depcon.c:76 #, c-format msgid "unable to check for existence of `%.250s'" msgstr "" -#: main/depcon.c:153 main/packages.c:389 +#: src/depcon.c:153 src/packages.c:389 msgid " depends on " msgstr "zavisi o" -#: main/depcon.c:154 +#: src/depcon.c:154 msgid " pre-depends on " msgstr "unaprijed zavisi o" -#: main/depcon.c:155 +#: src/depcon.c:155 msgid " recommends " msgstr "preporučuje" -#: main/depcon.c:156 +#: src/depcon.c:156 msgid " conflicts with " msgstr "sukobljava se sa" -#: main/depcon.c:157 +#: src/depcon.c:157 msgid " suggests " msgstr "predlaže" -#: main/depcon.c:158 +#: src/depcon.c:158 msgid " enhances " msgstr "poboljÅ¡ava" -#: main/depcon.c:234 +#: src/depcon.c:234 #, c-format msgid " %.250s is to be removed.\n" msgstr "" -#: main/depcon.c:237 +#: src/depcon.c:237 #, c-format msgid " %.250s is to be deconfigured.\n" msgstr "" -#: main/depcon.c:241 +#: src/depcon.c:241 #, c-format msgid " %.250s is to be installed, but is version %.250s.\n" msgstr "" -#: main/depcon.c:249 +#: src/depcon.c:249 #, c-format msgid " %.250s is installed, but is version %.250s.\n" msgstr "" -#: main/depcon.c:264 +#: src/depcon.c:264 #, c-format msgid " %.250s is unpacked, but has never been configured.\n" msgstr "" -#: main/depcon.c:268 +#: src/depcon.c:268 #, c-format msgid " %.250s is unpacked, but is version %.250s.\n" msgstr "" -#: main/depcon.c:274 +#: src/depcon.c:274 #, c-format msgid " %.250s latest configured version is %.250s.\n" msgstr "" -#: main/depcon.c:283 +#: src/depcon.c:283 #, c-format msgid " %.250s is %s.\n" msgstr "" -#: main/depcon.c:319 +#: src/depcon.c:319 #, c-format msgid " %.250s provides %.250s but is to be removed.\n" msgstr "" -#: main/depcon.c:323 +#: src/depcon.c:323 #, c-format msgid " %.250s provides %.250s but is to be deconfigured.\n" msgstr "" -#: main/depcon.c:328 +#: src/depcon.c:328 #, c-format msgid " %.250s provides %.250s but is %s.\n" msgstr "" -#. If the package wasn't installed at all, and we haven't said -#. * yet why this isn't satisfied, we should say so now. -#. -#: main/depcon.c:342 +#: src/depcon.c:342 #, c-format msgid " %.250s is not installed.\n" msgstr "" -#: main/depcon.c:373 +#: src/depcon.c:373 #, c-format msgid " %.250s (version %.250s) is to be installed.\n" msgstr "" -#: main/depcon.c:387 +#: src/depcon.c:387 #, c-format msgid " %.250s (version %.250s) is %s.\n" msgstr "" -#. conflicts and provides the same -#: main/depcon.c:412 +#: src/depcon.c:412 #, c-format msgid " %.250s provides %.250s and is to be installed.\n" msgstr "" -#: main/depcon.c:443 +#: src/depcon.c:443 #, c-format msgid " %.250s provides %.250s and is %s.\n" msgstr "" -#: main/enquiry.c:56 main/query.c:96 +#: src/enquiry.c:56 src/query.c:96 msgid "(no description available)" msgstr "" -#: main/enquiry.c:81 +#: src/enquiry.c:81 msgid "" "The following packages are in a mess due to serious problems during\n" "installation. They must be reinstalled for them (and any packages\n" "that depend on them) to function properly:\n" msgstr "" -#: main/enquiry.c:86 +#: src/enquiry.c:86 msgid "" "The following packages have been unpacked but not yet configured.\n" "They must be configured using dpkg --configure or the configure\n" "menu option in dselect for them to work:\n" msgstr "" -#: main/enquiry.c:91 +#: src/enquiry.c:91 msgid "" "The following packages are only half configured, probably due to problems\n" "configuring them the first time. The configuration should be retried using\n" "dpkg --configure or the configure menu option in dselect:\n" msgstr "" -#: main/enquiry.c:96 +#: src/enquiry.c:96 msgid "" "The following packages are only half installed, due to problems during\n" "installation. The installation can probably be completed by retrying it;\n" "the packages can be removed using dselect or dpkg --remove:\n" msgstr "" -#: main/enquiry.c:121 +#: src/enquiry.c:121 msgid "--audit does not take any arguments" msgstr "" -#: main/enquiry.c:156 +#: src/enquiry.c:156 msgid "" msgstr "" -#: main/enquiry.c:173 +#: src/enquiry.c:173 msgid "--yet-to-unpack does not take any arguments" msgstr "" -#: main/enquiry.c:211 +#: src/enquiry.c:211 #, c-format msgid " %d in %s: " msgstr "" -#: main/enquiry.c:226 +#: src/enquiry.c:226 #, c-format msgid " %d packages, from the following sections:" msgstr "" -#: main/enquiry.c:245 +#: src/enquiry.c:245 msgid "--assert-* does not take any arguments" msgstr "" -#: main/enquiry.c:260 +#: src/enquiry.c:260 #, c-format msgid "" "Version of dpkg with working epoch support not yet configured.\n" " Please use `dpkg --configure dpkg', and then try again.\n" msgstr "" -#: main/enquiry.c:264 +#: src/enquiry.c:264 #, c-format msgid "dpkg not recorded as installed, cannot check for epoch support !\n" msgstr "" -#: main/enquiry.c:307 +#: src/enquiry.c:307 msgid "--predep-package does not take any argument" msgstr "" -#: main/enquiry.c:359 +#: src/enquiry.c:359 #, c-format msgid "" "dpkg: cannot see how to satisfy pre-dependency:\n" " %s\n" msgstr "" -#: main/enquiry.c:360 +#: src/enquiry.c:360 #, c-format msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)" msgstr "" -#: main/enquiry.c:380 -#, c-format -msgid "" -"dpkg: unexpected output from `%s --print-libgcc-file-name':\n" -" `%s'\n" -msgstr "" - -#: main/enquiry.c:383 -#, c-format -msgid "compiler libgcc filename not understood: %.250s" -msgstr "" - -#: main/enquiry.c:387 -msgid "--print-installation-architecture does not take any argument" -msgstr "" - -#: main/enquiry.c:407 +#: src/enquiry.c:377 msgid "--print-architecture does not take any argument" msgstr "" -#: main/enquiry.c:413 -msgid "failed to fdopen CC pipe" -msgstr "" - -#: main/enquiry.c:431 -msgid "error reading from CC pipe" -msgstr "" - -#: main/enquiry.c:433 -msgid "empty output" -msgstr "" - -#: main/enquiry.c:435 -msgid "no newline" -msgstr "" - -#: main/enquiry.c:449 -#, c-format -msgid "dpkg: warning, architecture `%s' not in remapping table\n" -msgstr "" - -#: main/enquiry.c:491 +#: src/enquiry.c:419 msgid "" "--compare-versions takes three arguments: " msgstr "" -#: main/enquiry.c:496 +#: src/enquiry.c:424 msgid "--compare-versions bad relation" msgstr "" -#: main/enquiry.c:501 +#: src/enquiry.c:429 #, c-format msgid "version a has bad syntax: %s\n" msgstr "" -#: main/enquiry.c:511 +#: src/enquiry.c:439 #, c-format msgid "version b has bad syntax: %s\n" msgstr "" -#: main/errors.c:56 +#: src/errors.c:58 #, c-format msgid "" "%s: error processing %s (--%s):\n" " %s\n" msgstr "" -#: main/errors.c:60 +#: src/errors.c:81 msgid "" "dpkg: failed to allocate memory for new entry in list of failed packages." msgstr "" -#: main/errors.c:70 +#: src/errors.c:91 #, c-format msgid "dpkg: too many errors, stopping\n" msgstr "" -#: main/errors.c:76 +#: src/errors.c:97 msgid "Errors were encountered while processing:\n" msgstr "" -#: main/errors.c:83 +#: src/errors.c:104 msgid "Processing was halted because there were too many errors.\n" msgstr "" -#: main/errors.c:91 +#: src/errors.c:112 #, c-format msgid "Package %s was on hold, processing it anyway as you request\n" msgstr "" -#: main/errors.c:95 +#: src/errors.c:116 #, c-format msgid "" "Package %s is on hold, not touching it. Use --force-hold to override.\n" msgstr "" -#: main/errors.c:104 +#: src/errors.c:125 msgid "" "dpkg - warning, overriding problem because --force enabled:\n" " " msgstr "" -#: main/filesdb.c:123 +#: src/filesdb.c:123 #, c-format msgid "unable to open files list file for package `%.250s'" msgstr "" -#: main/filesdb.c:128 +#: src/filesdb.c:128 #, c-format msgid "" "dpkg: serious warning: files list file for package `%.250s' missing, " "assuming package has no files currently installed.\n" msgstr "" -#: main/filesdb.c:145 +#: src/filesdb.c:145 #, c-format msgid "files list for package `%.250s'" msgstr "" -#: main/filesdb.c:158 +#: src/filesdb.c:158 #, c-format msgid "files list file for package `%.250s' contains empty filename" msgstr "" -#: main/filesdb.c:170 +#: src/filesdb.c:170 #, c-format msgid "error closing files list file for package `%.250s'" msgstr "" -#: main/filesdb.c:201 +#: src/filesdb.c:201 #, c-format msgid "(Reading database ... " msgstr "" -#: main/filesdb.c:209 +#: src/filesdb.c:209 #, c-format msgid "%d files and directories currently installed.)\n" msgstr "" -#: main/filesdb.c:240 +#: src/filesdb.c:240 #, c-format msgid "unable to create updated files list file for package %s" msgstr "" -#: main/filesdb.c:250 +#: src/filesdb.c:250 #, c-format msgid "failed to write to updated files list file for package %s" msgstr "" -#: main/filesdb.c:252 +#: src/filesdb.c:252 #, c-format msgid "failed to flush updated files list file for package %s" msgstr "" -#: main/filesdb.c:254 +#: src/filesdb.c:254 #, c-format msgid "failed to sync updated files list file for package %s" msgstr "" -#: main/filesdb.c:257 +#: src/filesdb.c:257 #, c-format msgid "failed to close updated files list file for package %s" msgstr "" -#: main/filesdb.c:259 +#: src/filesdb.c:259 #, c-format msgid "failed to install updated files list file for package %s" msgstr "" -#: main/filesdb.c:323 +#: src/filesdb.c:323 msgid "failed to open statoverride file" msgstr "" -#: main/filesdb.c:327 +#: src/filesdb.c:327 msgid "failed to fstat statoverride file" msgstr "" -#: main/filesdb.c:330 +#: src/filesdb.c:330 msgid "failed to fstat previous statoverride file" msgstr "" -#: main/filesdb.c:349 +#: src/filesdb.c:349 #, c-format msgid "statoverride file `%.250s'" msgstr "" -#: main/filesdb.c:362 +#: src/filesdb.c:362 msgid "statoverride file contains empty line" msgstr "" -#: main/filesdb.c:447 +#: src/filesdb.c:447 msgid "failed to open diversions file" msgstr "" -#: main/filesdb.c:451 +#: src/filesdb.c:451 msgid "failed to fstat previous diversions file" msgstr "" -#: main/filesdb.c:453 +#: src/filesdb.c:453 msgid "failed to fstat diversions file" msgstr "" -#: main/filesdb.c:474 +#: src/filesdb.c:474 msgid "fgets gave an empty string from diversions [i]" msgstr "" -#: main/filesdb.c:475 +#: src/filesdb.c:475 msgid "diversions file has too-long line or EOF [i]" msgstr "" -#: main/filesdb.c:481 +#: src/filesdb.c:481 msgid "read error in diversions [ii]" msgstr "" -#: main/filesdb.c:482 +#: src/filesdb.c:482 msgid "unexpected EOF in diversions [ii]" msgstr "" -#: main/filesdb.c:485 +#: src/filesdb.c:485 msgid "fgets gave an empty string from diversions [ii]" msgstr "" -#: main/filesdb.c:486 main/filesdb.c:497 +#: src/filesdb.c:486 src/filesdb.c:497 msgid "diversions file has too-long line or EOF [ii]" msgstr "" -#: main/filesdb.c:492 +#: src/filesdb.c:492 msgid "read error in diversions [iii]" msgstr "" -#: main/filesdb.c:493 +#: src/filesdb.c:493 msgid "unexpected EOF in diversions [iii]" msgstr "" -#: main/filesdb.c:496 +#: src/filesdb.c:496 msgid "fgets gave an empty string from diversions [iii]" msgstr "" -#: main/filesdb.c:504 +#: src/filesdb.c:504 #, c-format msgid "conflicting diversions involving `%.250s' or `%.250s'" msgstr "" -#: main/filesdb.c:513 +#: src/filesdb.c:513 msgid "read error in diversions [i]" msgstr "" -#: main/help.c:41 dselect/pkgdisplay.cc:52 +#: src/help.c:40 dselect/pkgdisplay.cc:52 msgid "not installed" msgstr "" -#: main/help.c:42 +#: src/help.c:41 msgid "unpacked but not configured" msgstr "" -#: main/help.c:43 +#: src/help.c:42 msgid "broken due to postinst failure" msgstr "" -#: main/help.c:44 dselect/pkgdisplay.cc:55 +#: src/help.c:43 dselect/pkgdisplay.cc:55 msgid "installed" msgstr "" -#: main/help.c:45 +#: src/help.c:44 msgid "broken due to failed removal" msgstr "" -#: main/help.c:46 +#: src/help.c:45 msgid "not installed but configs remain" msgstr "" -#: main/help.c:87 +#: src/help.c:86 msgid "dpkg - error: PATH is not set.\n" msgstr "" -#: main/help.c:102 +#: src/help.c:101 #, c-format msgid "dpkg: `%s' not found on PATH.\n" msgstr "" -#: main/help.c:109 +#: src/help.c:108 #, c-format msgid "" "%d expected program(s) not found on PATH.\n" "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin." msgstr "" -#: main/help.c:179 +#: src/help.c:178 #, c-format msgid "failed to chroot to `%.250s'" msgstr "" -#: main/help.c:227 +#: src/help.c:226 #, c-format msgid "error un-catching signal %s: %s\n" msgstr "" -#: main/help.c:245 +#: src/help.c:244 #, c-format msgid "unable to ignore signal %s before running script" msgstr "" -#: main/help.c:254 +#: src/help.c:253 #, c-format msgid "unable to set execute permissions on `%.250s'" msgstr "" -#: main/help.c:299 +#: src/help.c:298 #, c-format msgid "unable to stat installed %s script `%.250s'" msgstr "" -#: main/help.c:301 main/help.c:357 main/help.c:377 +#: src/help.c:300 src/help.c:356 src/help.c:376 #, c-format msgid "unable to execute %s" msgstr "" -#: main/help.c:325 +#: src/help.c:324 #, c-format msgid "unable to stat new %s script `%.250s'" msgstr "" -#: main/help.c:327 +#: src/help.c:326 #, c-format msgid "unable to execute new %s" msgstr "" -#: main/help.c:346 +#: src/help.c:345 #, c-format msgid "old %s script" msgstr "" -#: main/help.c:354 +#: src/help.c:353 #, c-format msgid "dpkg: warning - unable to stat %s `%.250s': %s\n" msgstr "" -#: main/help.c:361 +#: src/help.c:360 #, c-format msgid "dpkg - trying script from the new package instead ...\n" msgstr "" -#: main/help.c:368 +#: src/help.c:367 #, c-format msgid "new %s script" msgstr "" -#: main/help.c:372 +#: src/help.c:371 msgid "there is no script in the new version of the package - giving up" msgstr "" -#: main/help.c:374 +#: src/help.c:373 #, c-format msgid "unable to stat %s `%.250s'" msgstr "" -#: main/help.c:378 +#: src/help.c:377 #, c-format msgid "dpkg: ... it looks like that went OK.\n" msgstr "" -#. Huh ? -#: main/help.c:473 +#: src/help.c:472 #, c-format msgid "failed to rmdir/unlink `%.255s'" msgstr "" -#: main/help.c:477 dpkg-deb/info.c:54 +#: src/help.c:476 dpkg-deb/info.c:54 msgid "failed to exec rm for cleanup" msgstr "" -#: main/main.c:44 +#: src/main.c:43 msgid "Debian GNU/Linux `" msgstr "" -#: main/main.c:46 +#: src/main.c:45 msgid "' package management program version " msgstr "" -#: main/main.c:48 main/query.c:438 +#: src/main.c:47 src/query.c:438 msgid "" "This is free software; see the GNU General Public Licence version 2 or\n" "later for copying conditions. There is NO warranty.\n" "See " msgstr "" -#: main/main.c:50 main/query.c:440 +#: src/main.c:49 src/query.c:440 msgid " --licence for copyright and license details.\n" msgstr "" -#: main/main.c:58 +#: src/main.c:57 #, c-format msgid "" "Usage: \n" @@ -2067,11 +2017,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2113,7 +2059,7 @@ msgid "" "Use `dselect' or 'aptitude' for user-friendly package management.\n" msgstr "" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2127,17 +2073,17 @@ msgid "" "`more' !" msgstr "" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2158,26 +2104,26 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2218,3067 +2164,3041 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" " in this run ! Only configuring it once.\n" msgstr "" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr "" -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr "" -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr "" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr "" -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr "" -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr "" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr "" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" "but installing anyway as you request.\n" msgstr "" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" "%s" msgstr "" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" + +#: src/query.c:144 +msgid "Name" +msgstr "Naziv" + +#: src/query.c:144 +msgid "Version" +msgstr "Verzija" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Opis" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "" + +#: src/query.c:218 +msgid "to" +msgstr "za" + +#: src/query.c:218 +msgid "from" +msgstr "od" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr "" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Upotreba:" + +#: src/query.c:449 +#, c-format +msgid "" +" [

...\n" @@ -2245,11 +2193,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2387,7 +2331,7 @@ msgstr "" "\n" "Useu «dselect» o «aptitude» per a una gestió de paquets més amigable.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2413,17 +2357,17 @@ msgstr "" "Les opcions marcades amb ([*]) produeixen una extensa eixida - canalitzeu-la " "a través de «less» o «more»!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "accions en conflicte --%s i --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Avís: l'opció és obsoleta «--%s»\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2460,29 +2404,29 @@ msgstr "" "Les opcions de depuració es barregen fent el OR bit a bit.\n" "Noteu que els significats i els valors estan subjectes a canvis.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug requereix d'un número octal com a paràmetre" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nom de paquet buit en la llista de --ignore-depends separats per coma " "«%.250s»" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends necessita un nom de paquet legal. «%.250s» no ho és; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "enter invàlid per a --%s: «%.250s»" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2572,62 +2516,62 @@ msgstr "" "seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n" "activades per defecte.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opció force/refuse desconeguda «%.*s»" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "no s'ha pogut fer «malloc» en execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "no s'ha pogut fer «strdup» en execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "no s'ha pogut executar %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd accepta 1 argument, no 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd només accepta 1 argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "número invàlid per a --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "no s'ha pogut obrir «%i» per a un flux" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inesperat abans de la fí de la línia %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "es necessita una opció d'acció" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending no pren cap argument que no sigui una opció" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s almenys necessita un nom de paquet com a argument" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2635,12 +2579,12 @@ msgstr "" "heu d'especificar els paquets pels seus noms propis, no citant els noms dels " "fitxers en els que venen" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Paquet %s llistat més d'una vegada, només es processarà una.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2649,83 +2593,80 @@ msgstr "" "S'ha desempaquetat més d'una còpia del paquet %s!\n" " Només es configurarà una vegada.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " el paquet " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " que proveeix " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " serà desinstal·lat.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versió de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " en el sistema és " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: també configura «%s» (requerit per «%s»)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " encara no està configurat.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " no està instal·lat.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; tot i així:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "no es pot accedir a l'arxiu" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "s'ha produït un error en assegurar-se de que «%.250s» no existeix" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "no s'ha pogut executar dpkg-split per a veure si és part d'una part múltiple" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "l'espera per dpkg-split ha fallat" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "paquet reensamblat" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "S'està autenticant %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "no s'ha pogut fer «execl» sobre debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Ha fallat la verificació del paquet %s!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2734,32 +2675,31 @@ msgstr "" "Ha fallat la verificació del paquet %s,\n" "però s'instal·larà igualment tal i com heu demanat.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "correcte\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "no es pot obtindre un nom de fitxer únic per a la info. de control" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" "No s'ha pogut executar dpkg-deb per a extreure la informació de control" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "S'ha registrat la informació sobre %s a partir de %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "l'arquitectura del paquet (%s) no correspon amb la del sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2768,146 +2708,334 @@ msgstr "" "dpkg: referent a %s que conté %s, problema de predependència:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problema de predependència - no s'instal·la %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: avís - ignorant problema de predependència!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "S'està preparant per a reemplaçar %s %s (fent servir %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "S'està desempaquetant %s (de %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "el nom del conffile (que comença per «%.250s») és massa llarg (>%d caràcters)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "error de lectura en %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "s'ha produït un error en tancar %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "s'ha produït un error en intentar obrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "S'està desconfigurant %s, per a poder desinstal·lar %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "S'està desempaquetant el reemplaç de %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" "no es pot executar dpkg-deb per a obtindre l'arxiu del sistema de fitxers" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "s'ha produït un error en llegir l'eixida tar de dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "sistema de fitxers de l'arxiu tar corrupte - arxiu del paquet corrupte" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: esborra possibles zeros finals" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: avís - no es pot esborrar l'antic fitxer «%.250s»: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "no es pot llegir el directori «info»" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "la versió antiga del paquet té un nom de fitxer d'informació llarguíssim que " "comença per «%.250s»" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "no es pot esborrar el fitxer d'info. obsolet «%.250s»" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "no es pot instal·lar el (suposat) nou fitxer d'info. «%.250s»" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "no es pot obrir el directori de control temporal" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "el paquet conté un nom de fitxer d'info. llarguíssim (comença per «%.50s»)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "la info. de control del paquet conté el directori «%.250s»" # Què collons vol dir això, i què collons vol dir la traducció?! jm -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "a l'esborrar el directori «%.250s» amb la informació de control del paquet " "ocorregué un error diferent com de no ser un directori" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: avís - el paquet %s conté «list» com a fitxer d'informació" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "no es pot instal·lar el nou fitxer d'info. «%.250s» com a «%.250s»" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Noteu la desaparició de %s, que ha estat completament reemplaçat.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" "no es pot esborrar el fitxer d'info. de control «%.250s» que ha desaparegut" -#: main/remove.c:92 +# jm: Açò jo no se si traduir-ho. Ha de caber en una línia i tenim que dir +# jm: quina lletra correspón a cada estat. +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desitjat=Desconegut(u)/Instal·la(i)/Elimina(r)/Neteja(p)/Atura(h)\n" +"| Estat=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Estat,Err: majúsc." +"=dolent)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nom" + +#: src/query.c:144 +msgid "Version" +msgstr "Versió" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descripció" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "No s'ha trobat cap paquet que correspongui amb %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "desviat per %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desviació local" + +#: src/query.c:218 +msgid "to" +msgstr "a" + +#: src/query.c:218 +msgid "from" +msgstr "per" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search al menys necessita un nom de fitxer pare com argument" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s no trobat.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "El paquet «%s» no està instal·lat i no hi ha informació disponible.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "El paquet «%s» no està disponible.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "El paquet «%s» no està instal·lat.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "El paquet «%s» no conté cap fitxer (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "desviat localment" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "d'altres paquets desviats" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "desviat per %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " per a: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Useu dpkg --info (= dpkg-deb --info) per a examinar els fitxers d'arxiu,\n" +"i dpkg --contents (= dpkg-deb --contents) per a llistar-ne el contingut.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian «" + +# "Debian `dpkg-query' package ..." FIXME. jm +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "» eina de consultes al programa de gestió de paquets\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Forma d'ús: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2182,11 +2130,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2302,7 +2246,7 @@ msgstr "" "Pro u¾ivatelsky pøívìtivou správu balíkù pou¾ijte `dselect' nebo " "`aptitude'.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2326,17 +2270,17 @@ msgstr "" "\n" "Volby oznaèené [*] produkují obsáhlý výstup - pou¾ijte `less' nebo `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "odporující si akce --%s a --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Varování: zastaralá volba `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2374,26 +2318,26 @@ msgstr "" "Ladící pøepínaèe mohou být mixovány pou¾itím binárního OR.\n" "Poznámka: významy a hodnoty se mohou èasto mìnit.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug vy¾aduje oktalový parametr" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "prázdné jméno balíku v seznamu --ignore-depends `%250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends potøebuje platné jméno balíku, co¾ `%250s' není; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "neplatné èíslo pro --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2474,62 +2418,62 @@ msgstr "" "VAROVÁNÍ - pou¾ití oznaèených [!] pøepínaèù mù¾e vá¾nì po¹kodit instalaci.\n" "Implicitnì zapnuté donucovací volby jsou oznaèeny [*].\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "neznámá force/refuse volba `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "nelze provést malloc() v execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "nelze provést strdup v execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "nelze spustit %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd vy¾aduje jeden parametr" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd vy¾aduje pouze jeden parametr" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "neplatné èíslo pro --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "nelze otevøít `%i' pro proud" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "neoèekávaný konec souboru pøed koncem øádku %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "potøebuji zadat akci" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending nemá ¾ádný volitelný argument" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s potøebuje alespoò jedno jméno balíku" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2538,12 +2482,12 @@ msgstr "" "kterých\n" " jsou obsa¾eny" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Balík %s specifikován více ne¾ jednou, zpracovávám pouze jednou.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2552,82 +2496,79 @@ msgstr "" "Byla rozbalena více ne¾ jedna kopie balíku %s\n" " v tomto bìhu ! Konfiguruji jen jednou.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Balík " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr ", který poskytuje " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " bude odstranìn.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " verze balíku " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " v systému je " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: také konfiguruji `%s' (vy¾adováno balíkem `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " je¹tì není zkonfigurován.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " není nainstalován.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; av¹ak:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "nelze pøistoupit k archivu" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "chyba pøi ovìøování, ¾e `%.250s' neexistuje" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "chyba pøi spu¹tìní dpkg-split pro kontrolu rozdìlení na èásti" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "èekání na dpkg-split selhalo" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "spojený balík" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Kontroluji autenticitu %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "chyba pøi spu¹tìní debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Kontrola balíku %s selhala!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2636,31 +2577,30 @@ msgstr "" "Kontrola podpisu balíku %s selhala,\n" "ale pøesto instaluji.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "úspì¹ná\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "nelze získat jedineèné jméno pro soubor control" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "chyba pøi spou¹tìní dpkg-deb k získání informací z control" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Zaznamenány informace o %s z %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "architektura balíku (%s) se nezhoduje se systémem (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2669,140 +2609,318 @@ msgstr "" "dpkg: dívám se na %s obsahující %s, pøed-závislostní problém:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "pøed-závislostní problém - neinstaluji %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: varování - ignoruji pøed-závislostní problém!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Pøipravuji nahrazení %s %s (pomocí %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Rozbaluji %s (z %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "název `conffile' souboru (poèátek cesty `%.250s') je pøíli¹ dlouhý (>%d " "znakù)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "chyba ètení v %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "chyba uzavøení v %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "chyba pøi pokusu o otevøení %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Dekonfiguruji %s, aby mohl být odstranìn %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Rozbaluji náhradu %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "nelze spustit dpkg-deb pro získání obsahu balíku" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "chyba pøi ètení tar výstupu z dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "po¹kozený systémový tar sourbor - po¾kozený balík" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: ru¹ím mo¾né koncové nuly" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: varování - nelze smazat starý soubor `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "nelze pøeèíst adresáø info" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "stará verze baliku má pøíli¹ dlouhé jméno info souboru, který zaèíná `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "nelze odstranit starý info soubor `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "nelze instalovat nový info soubor `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "nelze otevøít doèasný kontrolní adresáø" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "balík obsahuje pøíli¹ dlouhé jméno info souboru (zaèíná `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "informace o balíku obsahují adresáø `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "informacec o balíku rmdir na `%.250s' neøekl, ¾e to není adresáø" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: varování - balík %s obsahoval seznam jako info soubor" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "nelze instalovat nový info soubor `%.250s' jako `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Poznamenávám zmizení balíku %s, který byl úplnì nahrazen.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "nelze smazat mizící kontrolní info soubor `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Po¾adované=Neznámé/Instalovat/Odinstalovat/Odstranit/Nechat\n" +"| Stav=Ne/Instalován/Konfiguraèní soubory/Rozbalen/Nezkonfigurován/" +"Nekompletní\n" +"| instalace\n" +"|/ Chyba?=(nic)/Nechat/Nutná pøeinstalace/X=oba problémy (Stav,Chyba: velké " +"písmeno=chyba)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Název" + +#: src/query.c:144 +msgid "Version" +msgstr "Verze" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Popis" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "%s nevyhovuje ¾ádný balík.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "odsunuto balíkem %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "místní odsunutí" + +#: src/query.c:218 +msgid "to" +msgstr "na" + +#: src/query.c:218 +msgid "from" +msgstr "z" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search potøebuje alespoò jednu souborovou masku" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s nenalezen.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Balík `%s' není nainstalován a není dostupná ¾ádná informace.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Balík `%s' není dostupný.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Balík `%s' není nainstalován.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Balík `%s' neobsahuje ¾ádné soubory (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "místní odsunutí" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "balík odsouvá ostatní" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "odsunuto balíkem %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " na: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Pou¾ijte dpkg --info (= dpkg-deb --info) k prozkoumání archivu,\n" +"a dpkg --contents (= dpkg-deb --contents) k vypsání jeho obsahu.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' program pro správu balíkù\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Pou¾ití: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2195,11 +2142,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2319,7 +2262,7 @@ msgstr "" "\n" "Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2344,17 +2287,17 @@ msgstr "" "Tilvalg markeret med [*] giver mange uddata - led dem gennem 'less' eller " "'more'!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "modstridende handlinger --%s og --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Advarsel: forældet tilvalg '--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2392,26 +2335,26 @@ msgstr "" "Aflusningstilvalg kan blandes med logisk og.\n" "Bemærk, at betydningerne og værdierne kan blive ændret fremover.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug kræver et oktalt parameter" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "tomt pakkenavn i --ignore-depends kommasepareret liste '%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends kræver et gyldigt pakkenavn. Det er '%.250s' ikke; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ugyldigt heltal for --%s: '%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2492,74 +2435,74 @@ msgstr "" "alvorligt.\n" "Gennemtvingsningstilvalg mærket [*] er aktiveret som standard.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "kunne ikke udføre 'malloc' i execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "kunne ikke udføre 'strdup' i execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "kunne ikke eksekvere %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd tager 1 parameter, ikke 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd tager kun 1 parameter" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ugyldigt tal for --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "kunne ikke åbne '%i' for strøm" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "uventet slut-på-fil før afslutningen af linje %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "kræver et handlings-tilvalg" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending tager ingen ikke-tilvalgs-parametre" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s kræver mindst ét pakkenavn som parameter" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" "du skal angive pakker ved deres egne navne, ikke ved de filnavne, de ligger i" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pakken %s nævnes flere gange, behandles kun én gang.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2568,83 +2511,80 @@ msgstr "" "Flere kopier af pakken %s er blevet udpakket under\n" " denne kørsel! Konfigurerer den kun én gang.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pakken " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " som giver " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " vil blive fjernet.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versionen af " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " på systemet er " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: konfigurerer også '%s' (krævet af '%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " er ikke konfigureret endnu.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " er ikke installeret.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ", men:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "kan ikke tilgå arkivet" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "kunne ikke sikre, at '%.250s' ikke eksisteret" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "kunne ikke eksekvere 'dpkg-split' for at se om den er en del af multiparter" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "afventning af 'dpkg-split' mislykkedes" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "genskabte pakkefilen" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Godkender %s...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "kunne ikke eksekvere debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verifikation af %s mislykkedes!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2653,31 +2593,30 @@ msgstr "" "Verifikation af %s mislykkedes,\n" "man installerer alligevel, efter dit ønske.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "godkendt\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "kunne ikke få unikt filnavn for kontrolinformation" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "kunne ikke eksekvere dpkg-deb for at udtrække kontrolinformation" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Gemte information om %s fra %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2686,144 +2625,322 @@ msgstr "" "dpkg: vedrørende %s, der indeholder %s, forhånds-afhængighedsproblem:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "forhåndsafhængighedsproblem - installerer ikke %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: advarsel - ignorerer forhåndsafhængighedsproblem!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Gør klar til at erstatte %s %s (med %s)...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Udpakker %s (fra %s)...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "navnet på konfigurationsfilen (starter med '%.250s') er for langt (>%d tegn)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "læsefejl i %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "fejl under lukning af %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "fejl ved forsøg på at åbne %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Dekonfigurerer %s, så vi kan fjerne %s...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Udpakker erstatning %.250s...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "kunne ikke eksekvere 'dpkg-deb' for at hente filsystemarkiv" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "fejl ved læsning af dpkg-deb's tar-uddata" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: fjern mulige afsluttende nuller" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: advarsel - kunne ikke slette den gamle fil '%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "kan ikke læse info-mappe" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "den gamle version af pakken har et overdrevet langt filnavn, der starter med " "'%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "kunne ikke fjerne forældet informationsfil '%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "kunne ikke installere (antaget) ny informationsfil '%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "kunne ikke åbne midlertidigt kontrolmappe" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "pakken indeholder et overdrevet langt informationsfilnavn (starter med " "'%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "pakkekontrolinformation indeholdt mappen '%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "pakkekontrolinformation 'rmdir' af '%.250s' påstod, det ikke er en mappe" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: advarsel - pakken %s indeholdt en liste som informationsfil" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "kunne ikke installere ny informationsfil '%.250s' som '%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" "(Bemærker forsvindingen af %s, der er blevet fuldstændigt erstattet.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "kunne ikke slette forsvindende kontrolinformationsfil '%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Ønsket=Ukendt/Installér/Fjern/Udrens/Tilbagehold\n" +"| Status=Ikke/Installeret/Opsæt.-files/Upakket/Opsætn.-fejl/Halvt-inst.\n" +"|/ Fjl?=(ingen)/Tilbageholdt/Geninst.-krævet/X=begge-dele (Status,Fjl: " +"versaler=slemt)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Navn" + +#: src/query.c:144 +msgid "Version" +msgstr "Version" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Beskrivelse" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Ingen pakker passede med %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "omrokér med %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokal omrokering" + +#: src/query.c:218 +msgid "to" +msgstr "til" + +#: src/query.c:218 +msgid "from" +msgstr "fra" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search kræver mindst ét filnavnsmønster som parameter" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s ikke fundet.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Pakken '%s' er ikke installeret og der er ingen tilgængelig information.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pakken '%s' er ikke tilgængelig.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pakken '%s' er ikke installeret.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pakken '%s' indeholder ingen filer (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalt omdirigeret" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pakke omdirigerer andre" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "omdirigeret af %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " til: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Brug dpkg --info (= dpkg-deb --info) til at undersøge arkivfiler,\n" +"og dpkg --contents (= dpkg-deb --contents) til at vise deres indhold.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian '" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' pakkehåndteringsprogram\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Brug: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2210,11 +2158,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2336,7 +2280,7 @@ msgstr "" "Benutzen Sie »dselect« oder »aptitude« für benutzerfreundliches " "Paketmanagement.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2358,17 +2302,17 @@ msgstr "" "\n" "Optionen mit [*] geben viel aus - schicken Sie es durch »less« oder »more«!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "Aktionen --%s und --%s stehen in Konflikt" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Warnung: veraltete Option »--%s«\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2405,27 +2349,27 @@ msgstr "" "Debug-Optionen werden durch bitweises Oder zusammengesetzt.\n" "Beachten Sie, dass sich die Werte und Bedeutungen ändern können.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug braucht ein oktales Argument" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "leerer Paketname in kommagetrennter --ignore-depends-Liste »%.250s«" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends braucht einen legalen Paketnamen. »%.250s« ist es nicht; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ungültige Zahl für --%s: »%.250s«" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2515,63 +2459,63 @@ msgstr "" "schwer\n" "beschädigen. Optionen markierten mit [*] sind per Vorgabe angestellt.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "unbekannte force/refuse-Option »%.*s«" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "konnte kein malloc durchführen in execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "konnte kein strdup durchführen in execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "konnte %s nicht ausführen" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd nimmt 1 Argument, nicht 0" # -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd nimmt nur 1 Argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ungültige Zahl für --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "konnte »%i« nicht für Stream öffnen" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "unerwartetes Dateiende vor Ende der Zeile %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "brauche eine Aktions-Option" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending nimmt keine Nicht-Options-Argumente" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s benötigt wenigstens ein Paketnamen-Argument" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2579,12 +2523,12 @@ msgstr "" "Sie müssen Pakete mit ihrem eigenen Namen angeben, nicht durch Angabe von " "Dateien, in denen sie geliefert wurden" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Paket %s mehr als einmal angegeben, wird nur einmal verarbeitet.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2593,85 +2537,82 @@ msgstr "" "Mehr als eine Kopie des Paketes %s wurde in diesem Durchlauf\n" " entpackt! Es wird nur einmal konfiguriert.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Paket " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr ", welches " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " bereitstellt, soll gelöscht werden.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Version von " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " auf dem System ist " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: Konfiguriere auch »%s« (benötigt von »%s«)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " bereitstellt, ist noch nicht konfiguriert.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " bereitstellt, ist nicht installiert.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; aber:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "kein Zugriff auf das Archiv" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "Fehler beim Sicherstellen, dass »%.250s« nicht existiert" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "Fehler beim Ausführen von dpkg-split, um festzustellen, ob es Teil eines " "Mehrteilers ist" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "Warten auf dpkg-split fehlgeschlagen" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "Paketdatei wieder zusammengebaut" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Authentifiziere %s ...\n" # -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "konnte kein execl von debsig-verify durchführen" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Überprüfung von Paket %s fehlgeschlagen!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2680,32 +2621,31 @@ msgstr "" "Überprüfung von Paket %s fehlgeschlagen,\n" " installiere trotzdem, wie Sie gefordert haben\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "bestanden\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "konnte keinen eindeutigen Dateinamen für die Control-Info erhalten" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" "Fehler beim Ausführen von dpkg-deb, um Steuerungsinformationen zu extrahieren" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Informationen aufgezeichnet über %s von %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "Paket-Architektur (%s) passt nicht zum System (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2714,143 +2654,326 @@ msgstr "" "dpkg: Betrachte %s, welches %s enthält, Vor-Abhängigkeitsproblem:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "Vor-Abhängigkeitsproblem - installiere %.250s nicht" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: Warnung - ignoriere Vor-Abhängigkeitsproblem!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Vorbereiten zum Ersetzen von %s %s (durch %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Entpacke %s (aus %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "Name von Conffile (beginnend mit »%.250s«) ist zu lang (>%d Zeichen)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "Lesefehler in %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "Fehler beim Schließen von %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "Fehler beim Öffnen von %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "De-Konfiguriere %s, damit wir %s entfernen können ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Entpacke Ersatz für %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "kann dpkg-deb nicht ausführen, um Dateisystem-Archiv zu erhalten" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "Fehler beim lesen der dpkg-deb-tar-Ausgabe" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "defektes Tar-Dateisystem - Paketarchiv ist defekt" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: Lösche evtl. Nullen am Ende" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: Warnung - alte Datei »%.250s« kann nicht gelöscht werden: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "kann info-Verzeichnis nicht lesen" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "alte Version des Paketes hat übermäßig langen Info-Dateinamen beginnend mit " "»%.250s«" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "veraltete info-Datei »%.250s« kann nicht gelöscht werden" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "kann neue (vermutete) Info-Datei »%.250s« nicht installieren" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "kann temporäres Control-Verzeichnis nicht öffnen" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "Paket enthält übermäßig langen Control-Info-Dateinamen (beginnend mit " "»%.50s«)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "Paket-control-Info enthielt Verzeichnis »%.250s«" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "Paket-Control-Info rmdir von »%.250s« ergab nicht, dass dies kein " "Verzeichnis ist" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: Warnung - Paket %s enthält eine Liste als Infodatei" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "kann neue Info-Datei »%.250s« nicht als »%.250s« installieren" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Bemerke Verschwinden von %s, welches komplett ersetzt wurde.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "kann verschwindende Control-Info-Datei »%.250s« nicht löschen" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Gewünscht=Unbekannt/Installieren/R=Entfernen/P=Säubern/Halten\n" +"| Status=Nicht/Installiert/Config/U=Entpackt/Fehlgeschl. Konf./Halb " +"install.\n" +"|/ Fehler?=(keiner)/Halten/R=Neuinst. notw/X=beides (Status, Fehler: " +"GROß=schlecht)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Name" + +#: src/query.c:144 +msgid "Version" +msgstr "Version" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Beschreibung" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Kein Paket gefunden, das auf %s passt.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "Umleitung durch %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokale Umleitung" + +#: src/query.c:218 +msgid "to" +msgstr "zu" + +#: src/query.c:218 +msgid "from" +msgstr "von" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search benötigt wenigstens ein Dateinamenmuster-Argument" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s nicht gefunden.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Paket »%s« ist nicht installiert und keine Info ist vorhanden.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Paket »%s« ist nicht verfügbar.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Paket »%s« ist nicht installiert.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Paket »%s« enthält keine Dateien (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokal umgeleitet" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "Paket leitet andere um" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "umgeleitet durch %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " zu: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Benutze dpkg --info (= dpkg-deb --info) zum Untersuchen von Archiven,\n" +"und dpkg --contents (= dpkg-deb --contents) zum Auflisten ihres " +"Inhalts.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian »" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "« Paketmanagement-Programm-Abfrage-Werkzeug\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Aufruf: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2110,7 +2056,7 @@ msgid "" "Use `dselect' or 'aptitude' for user-friendly package management.\n" msgstr "" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2124,17 +2070,17 @@ msgid "" "`more' !" msgstr "" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2155,26 +2101,26 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2215,3061 +2161,3035 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" " in this run ! Only configuring it once.\n" msgstr "" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr "" -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr "" -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr "" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr "" -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr "" -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr "" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr "" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" "but installing anyway as you request.\n" msgstr "" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" "%s" msgstr "" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" + +#: src/query.c:144 +msgid "Name" +msgstr "" + +#: src/query.c:144 +msgid "Version" +msgstr "" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "" + +#: src/query.c:218 +msgid "to" +msgstr "" + +#: src/query.c:218 +msgid "from" +msgstr "" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr "" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "" + +#: src/query.c:449 +#, c-format +msgid "" +" [ compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2311,17 +2255,13 @@ msgstr "" " dpkg -S|--search ... αναζήτηση αρχείων σε πακέτα\n" " dpkg -C|--audit έλεγχος κατεστραμμένων πακέτων\n" " dpkg --print-architecture προβολή αρχιτεκτονικής (από GCC)\n" -" dpkg --print-gnu-build-architecture προβολή έκδοσης GNU " -"αρχιτεκτονικής\n" -" dpkg --print-installation-architecture προβολή αρχιτεκτονικής (για εγκ/" -"ση)\n" " dpkg --compare-versions σύγκριση εκδόσεων - βλ. παρακάτω\n" " dpkg --help | --version εμφάνιση βοήθειας/έκδοσης\n" " dpkg --force-help | -Dh|--debug=help βοήθεια στην ενεργοποίηση debug\n" " dpkg --licence εμφάνιση άδειας χρήσης\n" "\n" "Χρήση dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile σε αρχειοθήκες (type %s --" +" -x|--extract|-X|--vextract|--fsys-tarfile σε αρχειοθήκες (δώστε %s --" "help.)\n" "\n" "Για εσωτερική χρήση: dpkg --assert-support-predepends | --predep-package |\n" @@ -2360,7 +2300,7 @@ msgstr "" "\n" "Χρησιμοποιήστε το `dselect' ή το 'aptitude' για φιλική διαχείριση πακέτων.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2383,17 +2323,17 @@ msgstr "" "Οι επιλογές με [*] εμφανίζουν αρκετό περιεχόμενο - χρησιμοποιήστε μια " "σωλήνωση με τις εντολές `less' ή `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "συγκρουόμενες δράσεις --%s και --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2433,30 +2373,30 @@ msgstr "" "άλγεβρα).\n" "Σημειώστε ότι οι εξηγήσεις και οι τιμές πιθανόν να αλλάξουν.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug απαιτεί ένα οκταδικό όρισμα" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "μη ορισμένο όνομα πακέτου στην χωρισμένη με κόμμα λίστα της --ignore-" "depends `%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "η --ignore-depends απαιτεί ένα έγκυρο όνομα πακέτου. Το `%.250s' δεν είναι. %" "s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "μη έγκυρος ακέραιος για --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2541,62 +2481,62 @@ msgstr "" "για το σύστημά σας. Ο εξαναγκασμός των επιλογών με σήμανση [*] είναι εξ'\n" "ορισμού ενεργοποιημένος.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "άγνωστη επιλογή force/refuse `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "αδύνατη η δέσμευση μνήμης με τη malloc στο execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "αδύνατη η αντιγραφή συμβολοσειράς με τη strdup στο execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "αδύνατη η εκτέλεση του %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "η --command-fd παίρνει 1 όρισμα, όχι 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd παίρνει μόνο 1 όρισμα" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "μη έγκυρος αριθμός για το --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "χρειάζεται μια επιλογή ενέργειας" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending δεν παίρνει κανένα όρισμα μη-επιλογής" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s χρειάζεται τουλάχιστον ένα όρισμα ονόματος πακέτου" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2604,14 +2544,14 @@ msgstr "" "Θα πρέπει να ορίσετε τα πακέτα με το όνομά τους και όχι με το όνομα των " "αρχείων τους" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" "Το πακέτο %s δόθηκε περισσότερες από μία φορές, η επεξεργασία θα γίνει μόνο " "μία φορά.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2620,84 +2560,81 @@ msgstr "" "Έχουν αποσυμπιεστεί περισσότερα από ένα αντίγραφα\n" "του πακέτου %s ! Θα ρυθμιστεί μόνο μια φορά.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Πακέτο " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " που παρέχει " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " πρόκειται να αφαιρεθεί.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Η έκδοση του " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " στο σύστημα είναι" -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: ρυθμίζεται επίσης το `%s' (απαιτείται από `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " δεν έχει ρυθμιστεί ακόμη.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " δεν είναι εγκατεστημένο.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ". Ωστόσο:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "αδύνατη η πρόσβαση στην αρχειοθήκη" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "σφάλμα κατά την επιβεβαίωση ότι το `%.250s' δεν υπάρχει" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "αδύνατη η εκτέλεση του dpkg-split για έλεγχο αν είναι τμήμα ενός " "πολυτμηματικού πακέτου" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "η αναμονή για το dpkg-split απέτυχε" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "ανασυγκρότηση αρχείου πακέτου" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Γίνεται πιστοποίηση %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "αδύνατη η εκτέλεση με execl του debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Η επαλήθευση του πακέτου %s απέτυχε!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2706,32 +2643,31 @@ msgstr "" "Η επαλήθευση του πακέτου %s απέτυχε,\n" "αλλά θα εγκατασταθεί όπως ζητήσατε.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "επιτυχής\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "αδύνατη η λήψη μοναδικού ονόματος αρχείου για πληροφορίες ελέγχου " -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "απέτυχε η εκτέλεση του dpkg-deb για εξαγωγή πληροφοριών ελέγχου" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Καταγράφτηκαν πληροφορίες ελέγχου για το %s από %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" "η αρχιτεκτονική του πακέτου (%s) δεν ταιριάζει με αυτή του συστήματος (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2740,145 +2676,333 @@ msgstr "" "dpkg: σχετικά με το %s που περιέχει %s, πρόβλημα προ-εξάρτησης:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "πρόβλημα προ-εξάρτησης - δε θα εγκατασταθεί %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: προειδοποίηση - αγνοείται το πρόβλημα προ-εξάρτησης !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Προετοιμασία για αντικατάσταση %s %s (χρησιμοποιώντας το %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "το όνομα του αρχείου ρυθμίσεων (από `%.250s') είναι πολύ μεγάλο (>%d " "χαρακτήρες)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "σφάλμα ανάγνωσης στο %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "σφάλμα κλεισίματος %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "σφάλμα κατά το άνοιγμα του %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Γίνεται απορρύθμιση του %s, ώστε να μπορεί να αφαιρεθεί το %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Αποσυμπίεση του αντικαταστάτη %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "αδύνατη η εκτέλεση του dpkg-deb για τη λήψη της αρχειοθήκης" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "σφάλμα κατά την ανάγνωση της εξόδου της tar από το dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "κατεστραμμένη αρχειοθήκη tar - κατεστραμμένη αρχειοθήκη πακέτου" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: διαγραφή πιθανών μηδενικών στο τέλος" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" "dpkg: προειδοποίηση - αδύνατη η διαγραφή του παλιού αρχείου `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "η παλιά έκδοση του πακέτου έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου " "πληροφοριών`%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "αδύνατη η διαγραφή του παρωχημένου αρχείου πληροφοριών `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "αδύνατη η εγκατάσταση (υποτιθέμενου) νέου αρχείου πληροφοριών `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "αδύνατο το άνοιγμα προσωρινού καταλόγου ελέγχου (control)" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "το πακέτο έχει υπερβολικά μεγάλο μήκος ονόματος αρχείου ελέγχου `%.250s'" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "οι πληροφορίες ελέγχου του πακέτου περιείχαν τον κατάλογο `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "δόθηκε rmdir του `%.250s' αλλά δεν δηλώθηκε ως μη κατάλογος" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg: προειδοποίηση - το πακέτο %s περιείχε λίστα ως αρχείο πληροφοριών" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "αδύνατη η εγκατάσταση νέου αρχείου πληροφοριών `%.250s' ως `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" "(Σημειώνεται η εξαφάνιση του %s, το οποίο έχει αντικατασταθεί πλήρως)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "αδύνατη η διαγραφή του προς εξαφάνιση αρχείου ελέγχου `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Όνομα" + +#: src/query.c:144 +msgid "Version" +msgstr "Έκδοση" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Περιγραφή" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Δε βρέθηκαν πακέτα που να ταιριάζουν με %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "παράκαμψη από %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "τοπική παράκαμψη" + +#: src/query.c:218 +msgid "to" +msgstr "προς" + +#: src/query.c:218 +msgid "from" +msgstr "από" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"η --search χρειάζεται τουλ.άχιστον μια παράσταση ονομάτων αρχείων ως " +"παράμετρο" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: Το %s δε βρέθηκε.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Το πακέτο `%s' δεν είναι εγκατεστημένο και δεν υπάρχουν διαθέσιμες " +"πληροφορίες.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Το πακέτο `%s' δεν είναι διαθέσιμο.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Το πακέτο `%s' δεν είναι εγκατεστημένο.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Το πακέτο `%s' δεν περιέχει κανένα αρχείο (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "τοπική παράκαμψη" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "το πακέτο παρακάμπτει άλλα" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "παρεκάμφθηκε από %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " προς: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Χρησιμοποιήστε το dpkg --info (= dpkg-deb --info) για επεξεργασία " +"αρχειοθηκών,\n" +"και dpkg --contents (= dpkg-deb --contents) για προβολή των περιεχομένων " +"τους.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' εργαλείο πληροφόρησης προγράμματος διαχείρισης πακέτων\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Χρήση: " + +#: src/query.c:449 +#, c-format +msgid "" +" [ ...\n" @@ -2297,11 +2244,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2434,7 +2377,7 @@ msgstr "" "\n" "Utilice `dselect' o 'aptitude' para una gestión de paquetes más amigable.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2459,17 +2402,17 @@ msgstr "" "Las opciones marcadas con ([*]) producen una salida extensa,\n" "¡fíltrela con `less' o con `more'!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "acciones en conflicto --%s y --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Atención: opción obsoleta `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2507,30 +2450,30 @@ msgstr "" "Las opciones de depuración se mezclan haciendo el OR bit por bit.\n" "Note que los significados y los valores están sujetos a cambios.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug necesita un número octal como parámetro" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nombre de paquete vacío en la lista de --ignore-depends separados por coma `" "%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends necesita un nombre de paquete legal.\n" "`%.250s' no lo es; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "entero inválido para --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2623,62 +2566,62 @@ msgstr "" "la instalación. Las opciones de forzado marcadas con [*] están activadas\n" "por omisión.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opción force/refuse desconocida `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "no se pudo ejecutar malloc en execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "no se pudo ejecutar strdup en execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "fallo al ejecutar %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd toma 1 argumento, no 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd sólo toma 1 argumento" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "número inválido para --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "no se pudo abrir `%i' para un flujo" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inesperado antes del fin de la línea %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "se necesita una opción de acción" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending no toma ningún argumento que no sea una opción" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s necesita al menos un nombre de paquete como argumento" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2687,12 +2630,12 @@ msgstr "" "nombres\n" "de los ficheros en los que vienen" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Paquete %s listado más de una vez, sólo se procesa una.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2701,82 +2644,79 @@ msgstr "" "¡Se ha desempaquetado más de una copia del paquete %s!\n" " Se configurará solamente una vez.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " el paquete " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " que provee " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " va a ser desinstalado.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versión de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " en el sistema es " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: también configurando `%s' (requerido por `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " no está configurado todavía.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " no está instalado.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; sin embargo:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "no se puede acceder al archivo" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "error al asegurarse de que `%.250s' no existe" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "fallo al ejecutar dpkg-split para ver si es parte de un multiparte" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "la espera por dpkg-split falló" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "paquete reensamblado" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Autentificando %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "fallo al ejecutar debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "¡Falló la verificación del paquete %s!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2785,33 +2725,32 @@ msgstr "" "Falló la verificación del paquete %s,\n" "pero se instalará de todas formas tal como se ha solicitado\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "correcto\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" "no se puede obtener un nombre de fichero único para la información de control" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "fallo al ejecutar dpkg-deb para extraer la información de control" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Registrada la información sobre %s a partir de %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" "la arquitectura del paquete (%s) no corresponde con la del sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2820,152 +2759,342 @@ msgstr "" "dpkg: acerca de %s que contiene %s, problema de predependencia:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problema de predependencia - no se instala %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: atención - ¡descartando problema de predependencia!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Preparando para reemplazar %s %s (usando %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Desempaquetando %s (de %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "el nombre del conffile (que comienza por `%.250s')\n" "es demasiado largo (>%d caracteres)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "error de lectura en %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "error al cerrar %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "error intentando abrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Desconfigurando %s, para poder desinstalar %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Desempaquetando el reemplazo de %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "no se puede ejecutar dpkg-deb para obtener el archivo" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "error al leer la salida de tar de dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "sistema de ficheros del archivo tar dañado - archivo de paquete dañado" # Please, que alguien me diga qué es eso de zap. sv -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: zapea posibles ceros finales" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: atención - no se puede borrar el fichero antiguo `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "no se puede leer el directorio `info'" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "la versión antigua del paquete tiene un nombre de fichero de información\n" "larguísimo que comienza por `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "no se puede borrar el fichero de información obsoleto `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" "no se puede instalar el (supuestamente) nuevo fichero de información `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "no se puede abrir el directorio de control temporal" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "el paquete contiene un nombre de fichero de información larguísimo\n" "(comienza con `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "la información de control del paquete contiene el directorio `%.250s'" # Este mensaje es realmente obtuso. Suerte que no sale nunca. sv -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "al borrar el directorio `%.250s' en la información de control del paquete\n" "ocurrió un error distinto de no ser un directorio" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg: atención - el paquete %s contiene `list' como fichero de información" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" "no se puede instalar el nuevo fichero de información `%.250s' como `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Note la desaparición de %s, que ha sido completamente reemplazado.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" "no se puede borrar el fichero de información de control `%.250s' que ha " "desaparecido" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Estado=No/Instalado/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: mayúsc." +"=malo)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nombre" + +#: src/query.c:144 +msgid "Version" +msgstr "Versión" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descripción" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "No se ha encontrado ningún paquete que corresponda con %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "desviación por %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desviación local" + +#: src/query.c:218 +msgid "to" +msgstr "a" + +#: src/query.c:218 +msgid "from" +msgstr "desde" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"--search necesita al menos un patrón de nombre de fichero como argumento" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: no se encontró %s.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"El paquete `%s' no está instalado y no hay ninguna información disponible.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "El paquete `%s' no está disponible.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "El paquete `%s' no está instalado.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "El paquete `%s' no contiene ningún fichero (¡!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "desviado localmente" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "el paquete desvía otros" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "desviado por %s" + +# Intraducible sin contexto, posiblemente es un "divert". sv +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " a: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Utilice dpkg --info (= dpkg-deb --info) para examinar archivos,\n" +"y dpkg --contents (= dpkg-deb --contents) para listar su contenido.\n" + +# This is broken. Translators do not translate words, they translate complete sentences. +# I would suggest using %s. sv +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Herramienta de consulta `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' del gestor de paquetes de Debian\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Modo de empleo: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2225,11 +2173,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2360,7 +2304,7 @@ msgstr "" "Erabili `dselect' edo 'aptitude' pakete kudeaketa lagungarriago bat " "izateko.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2385,17 +2329,17 @@ msgstr "" "\n" " [*] duten aukerek irteera luze bat dute - `less' edo `more' bidez erabili!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "elkarjotzen duten ekintzak: --%s eta --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Abisua: `--%s' zaharkituriko aukera\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2439,29 +2383,29 @@ msgstr "" "Arazpen aukerak bit bakoitzean OR eginez nahasten dira.\n" "Ohartu esanahi eta balioak aldaketak jasan ditzazketela.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug -ek zortzitar argumentu bat behar du" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "gakoz bereizitako --ignore-depends zerrendan baliogabeko pakete izena `" "%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends -ek baliozko pakete izen bat nehar du. `%.250s' ez da; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "--%s-rentzat zenbaki oso baliogabea: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2541,62 +2485,62 @@ msgstr "" "liteke.\n" "[*] markaturik dauden indartze aukerak lehenetsirik daude.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "indartze/debekatze aukera ezezaguna: `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "ezin da execbackend-en malloc egin" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "ezin da execbackend-en strdup egin" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "huts %s exekutatzean" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd argumentu bat behar du, ez 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd-ek bakarrik argumentu bat onartzen du" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "--command-fd -rentzat zenbaki baliogabea" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "Ezin da korrontearentzat '%i? ireki" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "ezuzteko fitxategi amaiera %d lerro amaiaeran" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "ekintza aukera bat behar da" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending ez du aukerez aparte argumenturik onartzen" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s baintzat pakete izen argumentu bat behar du" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2604,13 +2548,13 @@ msgstr "" "Paketeak bere izenak erbiliaz eman behar dituzu ez datozten paketaren izena " "erabiliaz" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" "%s paketea bein baino gehiagotan zerrendatua, bein bakarrik prozesatzen.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2619,84 +2563,81 @@ msgstr "" "%s paketearen kopia bat baino gehiago despaketatu da\n" " abiarazte honetan ! Bat bakarrik konfiguratzen.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Paketea " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " hau dakarrena: " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " ezabaturik izango da.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Bertsioa: " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " sistemakoa: " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: `%s' ere konfiguratzen (`%s'-k behar du)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " ez dago konfiguraturik oraindik.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " ez dago instalaturik.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; hala ere:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "ezin da fitxategia eskuratu" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "errorea `%.250s' ez dagoela ziurtatzerakoan" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "hust zati anitzeko fitxategi baten zati bat det jakiteko dpkg-split " "abiaraztean" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "huts dpkg-split itxoiterakoan" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "berrasamblatutako pakete fitxategia" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "%s Egiaztatzen ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "huts debsig-verify abiarazterakoan" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "%s pakete egiaztapenak huts egin du!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2705,31 +2646,30 @@ msgstr "" "%s pakete egiaztapenak huts egin du! baina zuk eskatu bezala instalatzen " "jarraituko da.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "amaiturik\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "ezin da kontrol argibidearentza fitxategi izen bakana eskuratu" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "huts kontrol argibideak ateratzerako dpkg-deb abiarazterakoan" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "%s buruzko argibidea %s-tik grabaturik.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "pakete arkitektura (%s) ez da sistemakoaren (%s) berdina" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2738,143 +2678,324 @@ msgstr "" "dpkg: honi buruz: %s hau duena: %s, aurredependentzi arazoa:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "aurre-dependentzi arazoa - ez da %.250s instalatuko" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: abisua - aurre-dependetzi arazoa ezikusia egiten!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "%s %s Ordezteko prestatzen (%s erabiliaz) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "%s despaketatzen (%s-tik) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "conf. fitxategiaren izena (`%.250s'-ez asten dena) luzeegia da (>%d " "karaktere)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "irakurketa errorea %.250s-en" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "errorea %.250s ixterakoan" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "errorea %.250s irekitzen saiatzerakoan" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "%s deskonfiguratzen, %s desinstalatu ahal izateko...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "%.250s bertsio berria despaketatzen...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "ezin da fitxategi sistema eskuratzeko dpkg-deb abiarazi" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "errorea dpkg-deb tar irteera irakurtzerakoan" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" "hondaturiko fitxategi sistema tar fitxategia - hondaturiko pakete fitxategia" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: kendu bukaerako zeroak baleude" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: abisua - ezin da `%.250s' fitxategi zaharra ezabatu: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "ezin da argibide karpeta irakurri" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "paketaren bertsio zaharrak argibide fitxategiak`%.250s'-ez asten den\n" "izen luze bat du" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "ezin da `%.250s' argibide fitxategi zaharkitua ezabatu" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "Ezin da (suposautiko) argibide `%.250s' fitxategi berria instalatu " -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "ezin da aldirako kontrol karpeta ireki" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "paketeak kontrol fitxategi izen luzeegi bat d u(`%.50s'-ez hasten da)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "paketearen kontrol argibideak `%.250s' karpeta du" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "`%.250s' pakete kontrol argibide karpeta ezabatzean karpeta bat ez dela " -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: abisua - %s paketeak zerrenda bat argibide fitxero bat bezala du" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "ezin da `%.250s' argibide fitxategi berria `%.250s' bezala instalatu" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Kontutan eduki %s desagertu dela, guztiz ordezkatua izan da.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "ezin da desagertutako `%.250s' argibide fitxategia ezabatu" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Izena" + +#: src/query.c:144 +msgid "Version" +msgstr "Bertsioa" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Azalpena" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "ez da %s duen paketerik aurkitu.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "%s-tik desbideratua" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desbideraketa lokala" + +#: src/query.c:218 +msgid "to" +msgstr "nora:" + +#: src/query.c:218 +msgid "from" +msgstr "nondik:" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--bilaketak beintzat fitxategi patroi argumentu bat behar du" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s ez da aurkitu.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "`%s' paketea ez dago instalaturik eta ez dago azalpenik erabilgarri.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "`%s' paketea ez dago eskuragarri.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "`%s' paketea ez dago instalaturik.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "`%s' paketeak ez du fitxategirik (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalki desbideratua" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "paketeak beste batzu desbideratzen ditu" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "%s-(e)k desbideratua" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " nora: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"dpkg --info (= dpkg-deb --info) erabili fitxategia arakatzeko,\n" +"eta dpkg --contents (= dpkg-deb --contents) bere edukiak zerrendatzeko..\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' pakete kudeatze programa galdeketa lanabesa\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Erabilera:" + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2410,10 +2352,6 @@ msgstr "" " abîmé(s)\n" " dpkg --print-architecture Afficher l'architecture cible\n" " (utilise GCC)\n" -" dpkg --print-gnu-build-architecture Afficher la version GNU de\n" -" l'architecture cible\n" -" dpkg --print-installation-architecture Afficher l'architecture de la\n" -" machine (pour l'installation)\n" " dpkg --compare-versions Comparer les numéros de version\n" " (voir ci-dessous)\n" " dpkg --help | --version Afficher cette aide et le numéro\n" @@ -2470,7 +2408,7 @@ msgstr "" "Utilisez « dselect » ou « aptitude » pour gérer les paquets de manière plus " "conviviale.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2497,17 +2435,17 @@ msgstr "" "Les options marquées d'un [*] affichent beaucoup d'informations - tubez-les " "à travers « less » ou « more » !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "actions conflictuelles --%s et --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Attention : option obsolète « --%s »\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2549,30 +2487,30 @@ msgstr "" "Les options de débogage peuvent être groupées avec un « ou » logique.\n" "Notez que la signification et les valeurs sont sujettes à changements.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug requiert un argument octal" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nom de paquet vide dans la liste « %.250s » d'éléments séparés par des " "virgules de --ignore-depends" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends requiert un nom de paquet légal. « %.250s » ne l'est pas ; %" "s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "entier incorrect pour --%s « %.250s »" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2664,62 +2602,62 @@ msgstr "" " installation.\n" "Les options de forçage marquées [*] sont activées par défaut.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "option de forçage/refus « %.*s » inconnue" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "Impossible de faire un « malloc » dans « execbackend »" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "Impossible de faire un « strdup » dans « execbackend »" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "échec de l'exécution de « %s »" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd prend un argument et non zéro" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd ne prend qu'un argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "nombre invalide pour --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "impossible d'ouvrir le flux d'entrée « %i »" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "EOF inattendu avant la fin de la ligne %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "requiert une option d'action" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending ne prend pas d'argument non optionnel" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s a besoin d'au moins un nom de paquet comme argument" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2727,12 +2665,12 @@ msgstr "" "vous devez spécifier les paquets par leur nom, et non par le nom des " "fichiers qui les contiennent" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Paquet %s listé plus d'une fois, mais traité une seule fois.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2741,84 +2679,81 @@ msgstr "" "Plus d'une copie du paquet %s ont été dépaquetées\n" " lors de ce traitement ! Une seule configuration effectuée.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Paquet " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " qui fournit " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " doit être supprimé.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " La version de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " sur le système est " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg : configuration additionnelle de « %s » (requise par « %s »)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " n'est pas encore configuré.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " n'est pas installé.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr " ; cependant :\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "ne peut pas accéder à l'archive" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "erreur obtenue en voulant s'assurer que « %.250s » n'existe pas" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "impossible d'exécuter dpkg-split pour voir s'il s'agit d'une partie d'un " "fichier découpé" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "l'attente de dpkg-split a échoué" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "fichier du paquet rassemblé" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Authentification de %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "échec de l'exécution (par execl) de « debsig-verify »" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "La vérification du paquet %s a échoué !" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2827,35 +2762,34 @@ msgstr "" "La vérification du paquet %s a échoué, mais traitement en cours malgré tout\n" "comme demandé.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "réussi\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" "impossible d'obtenir un nom de fichier unique pour les informations de " "contrôle" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" "impossible d'exécuter dpkg-deb pour l'extraction des informations de contrôle" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Enregistrement de l'information sur %s de %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" "l'architecture du paquet (%s) ne correspond pas à celle du système (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2864,151 +2798,336 @@ msgstr "" "dpkg : concernant %s contenant %s, problème de pré-dépendance :\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problème de pré-dépendance - %.250s non installé" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg : avertissement - problème de pré-dépendance ignoré !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Préparation du remplacement de %s %s (en utilisant %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Dépaquetage de %s (à partir de %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "le nom du conffile (commençant par « %.250s ») est trop long (>%d caractères)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "erreur de lecture dans %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "erreur de fermeture de %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "erreur survenue en essayant d'ouvrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Déconfiguration de %s, pour pouvoir supprimer %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Dépaquetage de la mise à jour de %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" "impossible d'exécuter dpkg-deb pour obtenir l'archive du système de fichiers" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "erreur de lecture sur la sortie du « tar » de dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "archive du système de fichiers corrompue - archive du paquet corrompue" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "" "dpkg-deb : suppression de possibles zéros finaux (i.e. de « trailing »)" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" "dpkg : avertissement - impossible de supprimer l'ancien fichier « %.250s » : " "%s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "ne peut pas lire le répertoire info" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "l'ancienne version du paquet a un nom de fichier d'information commençant " "par « %.250s » trop long" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "impossible de supprimer le fichier info obsolète « %.250s »" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "impossible d'installer le (supposé) nouveau fichier info « %.250s »" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "impossible d'ouvrir le répertoire de contrôle temporaire" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "le paquet contient un nom de fichier de contrôle trop long (commençant par " "« %.50s »)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "l'information de contrôle du paquet contient le répertoire « %.250s »" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "l'information de contrôle du paquet « rmdir » de « %.250s » ne dit pas que " "ce n'est pas un répertoire" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg : avertissement - le paquet %s contient une liste comme fichier " "d'information" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" "impossible d'installer le nouveau fichier info « %.250s » comme « %.250s »" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(À noter la disparition de %s, qui a été complètement remplacé.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "impossible de supprimer le fichier info de contrôle disparu « %.250s »" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Souhait=inconnU/Installé/suppRimé/Purgé/H=à garder\n" +"| État=Non/Installé/fichier-Config/dépaqUeté/échec-conFig/H=semi-installé\n" +"|/ Err?=(aucune)/H=à garder/besoin Réinstallation/X=les deux (État,Err: " +"majuscule=mauvais)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nom" + +#: src/query.c:144 +msgid "Version" +msgstr "Version" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Description" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Aucun paquet ne correspond à %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "détourné par %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "détournement local" + +#: src/query.c:218 +msgid "to" +msgstr "à" + +#: src/query.c:218 +msgid "from" +msgstr "de" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search a besoin d'au moins un motif de nom de fichier comme argument" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg : %s introuvable.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Le paquet « %s » n'est pas installé et aucune information n'est disponible.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Le paquet « %s » n'est pas disponible.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Le paquet « %s » n'est pas installé.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Le paquet « %s » ne contient aucun fichier (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "détourné localement" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "paquet détournant les autres" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "détourné par %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " vers : %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Utilisez dpkg --info (= dpkg-deb --info) pour examiner les fichiers\n" +"archives, et dpkg --contents (= dpkg-deb --contents) pour afficher leur\n" +"contenu.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian « " + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr " » outil d'interrogation du programme de gestion de paquets\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Usage : " + +#: src/query.c:449 +#, c-format +msgid "" +" [ ...\n" @@ -2216,11 +2163,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2342,7 +2285,7 @@ msgstr "" "\n" "Use `dselect' ou \"aptitude\" para unha xestión de paquetes máis amigable.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2367,17 +2310,17 @@ msgstr "" "As opcións marcadas con [*] producen unha saída extensa - ¡ fíltrea con\n" "`less' ou `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "as accións --%s e --%s están en conflicto" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Aviso: a opción `--%s' está obsoleta\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2414,29 +2357,29 @@ msgstr "" "As opcións de depurado mistúranse usando un OR bit a bit.\n" "Note que os significados e os valores estan suxeitos a cambios.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug precisa dun argumento octal" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nome de paquete nulo na lista de --ignore-depends separados por coma `%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends require un nome de paquete legal. `%.250s' non o é; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "enteiro incorrecto para --%s: `%.250s'" # `incidental' -> tomei a traducción da versión castelá -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2515,62 +2458,62 @@ msgstr "" "instalación. As opcións de forzado marcadas con [*] están activadas\n" "por defecto.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opción force/refuse descoñecida `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "non se puido facer malloc en execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "non se puido facer strdup en execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "erro ó executar %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd leva 1 argumento, non 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd só leva 1 argumento" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "número non válido para --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "non se puido abrir `%i' en modo fluxo" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inesperado antes do fin da liña %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "é necesaria unha opción de acción" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending non leva argumentos que non sexan opcións" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s precisa polo menos dun nome de paquete como argumento" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2578,12 +2521,12 @@ msgstr "" "debe especificar os paquetes polos seus nomes, non citando os nomes dos\n" "ficheiros nos que veñen" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "O paquete %s está listado máis dunha vez, só se procesará unha vez.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2592,83 +2535,80 @@ msgstr "" "¡ Desempaquetouse máis dunha copia do paquete %s nesta execución !\n" " Só se configurará unha vez.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " O paquete " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " que proporciona " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " vai ser desinstalado.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " A versión de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " no sistema é " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: tamén se configurará `%s' (requerido por `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " non está configurado aínda.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " non está instalado.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; nembargantes:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "non se pode acceder ó arquivo" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "erro ó asegurarse de que `%.250s' non existe" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "erro ó executar dpkg-split para ver se é parte dun multiparte" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "a espera por dpkg-split fallou" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "paquete reensamblado" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Autenticando %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "erro ó executar debsig-verify con execl" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "¡A verificación do paquete %s fallou!" # `on hold' -> `conxelado' ... ¿algunha alternativa mellor? -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2678,31 +2618,30 @@ msgstr "" "pero aínda así será instalado, como se solicitou.\n" # Esto indica que a autenticación é correcta -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "feito\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "non se puido obter un nome de ficheiro único para a info de control" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "non se puido executar dpkg-deb para extraer a información de control" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Rexistrada información acerca de %s a partir de %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "a arquitectura do paquete (%s) non cadra coa do sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2711,148 +2650,333 @@ msgstr "" "dpkg: acerca de %s, que contén %s, problema de pre-dependencias:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problema de pre-dependencias - non se instalará %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: aviso - ¡ ignorando problema de pre-dependencias !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Preparando para remprazar %s %s (usando %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Desempaquetando %s (de %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "o nome do conffile (comeza por `%.250s') é moi longo (>%d caracteres)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "erro de lectura en %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "erro pechando %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "erro intentando abrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Desconfigurando %s, para que se poida desinstalar %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Desempaquetando o remprazo de %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "non se puido executar dpkg-deb para obter o arquivo" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "erro lendo a saída de tar do dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "ficheiro tar corrompido - o paquete está corrompido" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: borrar os posibles ceros á final" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: aviso - non se puido borrar o ficheiro antigo `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "non se pode ler o directorio de información" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "a versión antiga do paquete ten un ficheiro de información cun nome\n" "longuísimo que comeza por `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "non se puido eliminar o ficheiro de información obsoleto `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" "non se puido instalar o (supostamente) novo ficheiro de información `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "non se puido abrir o directorio de control temporal" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "o paquete contén un nome de ficheiro de información de control longuísimo\n" "(comeza por `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "a información de control do paquete contiña o directorio `%.250s'" # Qué mal sona esto traducido... -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "ó borrar o directorio `%.250s' na información de control do paquete\n" "atopouse un erro distinto de non ser un directorio" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: aviso - o paquete %s contiña `list' como ficheiro de información" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" "non se puido instalar o novo ficheiro de información `%.250s' como `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Note a desaparición de %s, que foi completamente remprazado.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" "non se puido borrar o ficheiro de información de control `%.250s' que " "desapareceu" -#: main/remove.c:92 +# Penso que é mellor deixar sen traducir esto +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nome" + +#: src/query.c:144 +msgid "Version" +msgstr "Versión" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descripción" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Non se atoparon paquetes que se correspondan con %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "desviación por %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desviación local" + +#: src/query.c:218 +msgid "to" +msgstr "a" + +#: src/query.c:218 +msgid "from" +msgstr "desde" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"--search precisa polo menos dun patrón de nome de ficheiro como argumento" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: non se atopou %s.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "O paquete `%s' non está instalado e non hai información dispoñible.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "O paquete `%s' non está dispoñible.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "O paquete `%s' non está instalado.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "O paquete `%s' non contén ningún ficheiro (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "desviado localmente" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "o paquete desvía a outros" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "desviado por %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " a: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Usa dpkg --info (= dpkg-deb --info) para examinar os ficheiros,\n" +"e dpkg --contents (= dpkg-deb --contents) para lista-lo seu contido.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Administrador de paquetes `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' de Debian\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Uso: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2110,7 +2056,7 @@ msgid "" "Use `dselect' or 'aptitude' for user-friendly package management.\n" msgstr "" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2124,17 +2070,17 @@ msgid "" "`more' !" msgstr "" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2155,26 +2101,26 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2215,3063 +2161,3037 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" " in this run ! Only configuring it once.\n" msgstr "" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr "" -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr "" -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr "" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr "" -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr "" -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr "" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr "" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" "but installing anyway as you request.\n" msgstr "" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" "%s" msgstr "" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" + +#: src/query.c:144 +msgid "Name" +msgstr "" + +#: src/query.c:144 +msgid "Version" +msgstr "" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "" + +#: src/query.c:218 +msgid "to" +msgstr "" + +#: src/query.c:218 +msgid "from" +msgstr "" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr "" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "" + +#: src/query.c:449 +#, c-format +msgid "" +" [ compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2251,85 +2142,8 @@ msgid "" "\n" "Use `dselect' or 'aptitude' for user-friendly package management.\n" msgstr "" -"Penggunaan:\n" -" dpkg -i|--install ...| -R|--recursive ...\n" -" dpkg --unpack ...| -R|--recursive ...\n" -" dpkg -A|--record-avail ... |-R|--recursive ...\n" -" dpkg --configure ... |-a|--pending \n" -" dpkg -r|-remove |-P|--purge ... |-a|--pending \n" -" dpkg --get-selections [ ...] tampilkan daftar pemilihan paket " -"ke stdout \n" -" dpkg --set-selections tentukan pemilihan paket dari " -"stdin \n" -" dpkg --update-avail ganti info paket yang tersedia \n" -" dpkg --merge-avail gabungkan dengan info dari " -"berkas \n" -" dpkg --clear-avail hapus info paket yang tersedia \n" -" dpkg --forget-old-unavail abaikan paket yang tak tersedia " -"dan tak terpasang \n" -" dpkg -s|--status ... tampilkan rincian status paket \n" -" dpkg -p|--print-avail ... tampilkan rincian paket yang " -"tersedia \n" -" dpkg -L|--listfiles ... tampilkan daftar berkas dalam " -"paket \n" -" dpkg -l|-list [ ...] tampilkan status paket secara " -"singkat \n" -" dpkg -S|--search ... cari paket yang berisi berkas \n" -" dpkg -C|--audit periksa paket-paket rusak \n" -" dpkg --print-architecture cetak arsitektur target (pakat " -"GCC) \n" -" dpkg --print-gnu-build-architecture cetak versi GNU pada arsitektur " -"target \n" -" dpkg --print-installation-architecture cetak arsitektur host (untuk " -"pemasangan)\n" -" dpkg --compare-versions bandingkan nomor versi - lihat di " -"bawah ini \n" -" dpkg --help| --version lihat panduan ini / nomor versi \n" -" dpkg --force-help | -Dh|--debug=help panduan pada proses debugging \n" -" dpkg --licensee cetak syarat-syarat lisensi dan " -"hak cipta \n" -"Gunakan dpkg -b|--build|-c|--contents|-e|--control|-l|--info|-f|--field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile pada arsip (ketik %s --help). \n" -"\n" -"Penggunaan internal: dpkg --assert-support-predepends | --predep-package |\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-" -"conrep \n" -"\n" -"Pilihan: \n" -" --admindir= Gunakan , bukannya %s \n" -" --root= Pasang pada sistem root alternatif \n" -" --instdir= Ganti root pemasangan tanpa mengganti dir " -"admin \n" -" -O|--selected-only Abaikan paket yang tidak dipilih \n" -" -E|--skip-same-version Abaikan paket dengan versi sama \n" -" -G|--refuse-downgrade Abaikan paket dengan versi lebih rendah \n" -" -B|--auto-deconfigure Pasang saja meski akan merusak paket " -"lain \n" -" --no-debsig Jangan mencocokkan tanda tangan pada " -"paket \n" -" --no-act|--dry-run|--simulate \n" -" Tunjukkan apa yang akan dilakukan - " -"jangan dikerjakan \n" -" -D|-debug= Aktifkan proses debug - lihat -Dhelp atau " -"--debug=help \n" -" --status-fd Kirimkan perubahan status ke deskriptor " -"berkas \n" -" --ignore-depends=, ... Abaikan ketergantungan yang melibatkan " -" \n" -" --forrce-... Masalah penimpaan - lihat --force-help \n" -" --no-force-... |--refuse-... Hentikan bila ada masalah \n" -" --abort-after Batalkan setelah menemui masalah \n" -"\n" -"Operator pembandingan untuk --compare-versions adalah: \n" -" lt le eq ne ge gt (anggap versi kosong sebagai versi lebih lama);\n" -" lt-nl le-nl ge-nl gt-nl (anggp versi kosong sebagai versi lebih baru);\n" -" < << <= = >= >> > (hanya sebagai kesesuaian dengan sintaks berkas " -"control).\n" -"\n" -"Gunakan `dselect' atau `aptitude' untuk pengelola paket yang akrab-" -"pengguna.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2342,27 +2156,18 @@ msgid "" "Options marked [*] produce a lot of output - pipe it through `less' or " "`more' !" msgstr "" -"Ketik dpkg --help untuk panduan tentang memasang dan membuang paket [*];\n" -"Gunakan dselect untuk pengelolaan paket secara interaktif;\n" -"Ketik dpkg -Dhelp untuk melihat daftar nilai debug dpkg;\n" -"Ketik dpkg --force-help untuk melihat daftar pilihan paksa;\n" -"Ketik dpkg-deb --help untuk panduan tentang manipulasi berkas *.deb;\n" -"Ketik dpkg --licence untuk melihat lisensi hak cipta dan ketiadaan jaminan " -"(GNU GPL) [*].\n" -"Pilihan bertanda [*] menghasilkan banyak kalimat - gunakan pipe ke `less' " -"atau `more'!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" -msgstr "aksi --%s dan --%s berbenturan" +msgstr "aksi berbenturan --%s dan --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" -msgstr "PERINGATAN: pilihan '--%s' sudah usang \n" +msgstr "PERINGATAN: pilihan `--%s' sudah usang \n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2382,45 +2187,27 @@ msgid "" "Debugging options are be mixed using bitwise-or.\n" "Note that the meanings and values are subject to change.\n" msgstr "" -"pilihan debug %s, --debug= atau -D: \n" -"\n" -" angka ref. di sumber keterangan\n" -" 1 umum Informasi kemajuan yang sangat membantu\n" -" 2 skrip Penerapan dan status skrip pengelola\n" -" 10 tiapberkas Hasil dari setiap berkas yang diproses\n" -" 100 rincitiapberkas Hasil rinci dari setiap berkas yang diproses\n" -" 20 berkaskonf Hasil dari setiap berkas konfigurasi\n" -" 200 rianciberkaskonf Hasil rinci dari setiap berkas konfigurasi\n" -" 40 depcon Ketergantungan dan bentrok\n" -" 400 rincidepcon Hasil rinci dari ketergantungan danbentrok\n" -" 1000 sangatrinci Hasil rincian drivel tentang, misalnya, " -"direktori dpkg/info\n" -" 2000 rincianbodoh Segala hasil dari drivel\n" -"\n" -"Pilihan-pilihan debug akan saling dipadukan dengan operasi 'bit or'.\n" -"Ingat bahwa arti dan nilai di atas bisa saja berubah.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug membutuhkan sebuah argumen oktal" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" -msgstr "nama paket nihil dalam daftar terpisah-koma --ignore-depends `%.250s'" +msgstr "" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -"--ignore-depends memerlukan sebuah nama paket yang sah. `%.250s' tidak; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "integer untuk --%s tidak sah: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2460,400 +2247,483 @@ msgid "" "WARNING - use of options marked [!] can seriously damage your installation.\n" "Forcing options marked [*] are enabled by default.\n" msgstr "" -"pilihan paksaan %s - pengendalian ketika masalah timbul:\n" -" peringatkan tapi jalan terus: --force-,,...\n" -" hentikan dengan laporan: --refuse-,,...| --no-force-" -",...\n" -" Paksakan sesuatu:\n" -" all Setel semua pilihan paksaan\n" -" auto-select [*] (Jangan)pilih paket untuk dipasang (dibuang)\n" -" downgrade [*] Ganti paket dengan versi lebih rendah\n" -" configure-any Konfigurasi sembarang paket yang mungkin membantu\n" -" hold Proses paket-paket darurat walau sedang dicekal\n" -" bad-path PATH kehilangan program-program penting, masalah " -"tampaknya\n" -" not-root Coba untuk (jangan)memasang sesuatu walau bukan root\n" -" overwrite-deverted Timpa berkas yang dialihkan dengan yang tidak\n" -" bad-verify Pasang paket walau gagal melalui pemeriksaan " -"otentikasi\n" -" depends-version [!] Jadikan masalah ketergantungan versi sebagai " -"peringatan\n" -" depends [!] Jadikan semua masalah ketergantungan versi sebagai " -"peringatan\n" -" confnew [!] Selalu gunakan berkas konfig baru, jangan tanya\n" -" confold [!] Selalu gunakan berkas konfig lama, jangan tanya\n" -" confdef [!] Gunakan pilihan bawaan untuk berkas konfig baru jika " -"tersedia,\n" -" jangan tanya. Jika tidak ada berkas bawaan, Anda " -"akan ditanya\n" -" kecuali bila salah satu dari pilihan confold atau " -"confnew juga ada\n" -" confmiss [!] Selalu pasang berkas konfig yang hilang\n" -" conflicts [!] Izinkan pemasangan paket-paket yang bentrok\n" -" architecture [!] Tetap diproses walau salah arsitektur\n" -" overwrite=dir [!] Timpa direktori suatu paket dengan berkas lain\n" -" remove-reinstreq [!] Buang paket yang perlu dipasang\n" -" remove-essential [!] Buang suatu paket penting\n" -"\n" -"PERINGATAN - penggunaan pilihan bertanda [!] dapat membuat sistem rusak " -"parah.\n" -"Pilihan paksaan bertanda [*] akan langsung diaktifkan.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "Pilihan force/refuse `%.*s' tak dikenal" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "tidak dapat melakukan 'malloc' pada 'execbackend'" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "tidak dapat melakukan 'strdup' pada 'execbackend'" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "Gagal menjalankan perintah %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd butuh 1 argumen, bukan 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" -msgstr "--command-fd hanya butuh 1 argumen" +msgstr "" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" -msgstr "angka tidak sah untuk --command-fd" +msgstr "" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "tidak dapat membuka `%i' untuk stream" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" -msgstr "eof tidak diharapkan sebelum akhir baris %d" +msgstr "" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "butuh suatu pilihan aksi" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" -msgstr "--%s --pending tidak butuh suatu argumen bukan-pilihan" +msgstr "" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s butuh sedikitnya satu argumen nama paket" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" -"Anda harus menentukan paket dengan namanya masing-masing, bukan dengan " -"mengutip nama berkas-berkas yang dibawanya." -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" -msgstr "Paket %s terdaftar lebih dari sekali, hanya memprosesnya sekali.\n" +msgstr "" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" " in this run ! Only configuring it once.\n" msgstr "" -"Lebih dari satu salinan paket %s yang telah dibuka\n" -" dalam pemasangan ini! Hanya akan mengonfigurasi sekali saja.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " -msgstr " Paket " +msgstr " PAKET" -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " -msgstr " yang menyediakan " +msgstr " yang menyediakan" -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " akan dibuang. \n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " -msgstr " Versi: " +msgstr " Versi:" -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " -msgstr " pada sistem adalah " +msgstr " pada sistem adalah" -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" -msgstr "dpkg: juga mengonfigurasi `%s' (diperlukan oleh `%s')\n" +msgstr "" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " belum dikonfigurasi. \n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " tidak dipasang. \n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" -msgstr "; tetapi:\n" +msgstr "" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "tidak dapat mengakses arsip" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" -msgstr "ada kesalahan saat memastikan `%.250s' tidak ada" +msgstr "" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" -"gagal menjalankan 'dpkg-split' untuk melihat jika bagiannya merupakan suatu " -"banyak-bagian (multiparter)" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" -msgstr "gagal menunggu dpkg-split" +msgstr "" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "menyusun ulang berkas paket" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Melakukan otentikasi (%s) ... \n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" -msgstr "gagal menjalankan 'debsig'verify'" +msgstr "" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Pemeriksaan paket %s gagal!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" "but installing anyway as you request.\n" msgstr "" -"Verifikasi paket %s gagal,\n" -"tetapi tetap memasangnya sesuai permintaan.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" -msgstr "dilewati\n" +msgstr "" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" -msgstr "tidak bisa mendapatkan nama berkas unik untuk info 'control'" +msgstr "" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" -msgstr "Gagal menjalankan 'dpkg-deb' untuk mengekstrak informasi 'control'" +msgstr "" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" -msgstr "Merekam info tentang %s dari %s.\n" +msgstr "" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" -msgstr "arsitektur paket (%s) tidak cocok dengan sistem (%s)" +msgstr "" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" "%s" msgstr "" -"dpkg: memandang %s berisi %s, masalah pra-ketergantungan:\n" -"%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" -msgstr "Ada masalah pra-ketergantungan - tidak akan memasang %.250s" +msgstr "" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: PERINGATAN - mengabaikan masalah pra-ketergantungan! \n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" -msgstr "Bersiap-siap mengganti %s %s (dengan %s) ... \n" +msgstr "Bersiap-siap mengganti %s %s (dengan %s)... \n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Sedang membuka paket %s (dari %s) ... \n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" -"nama 'conffile' (dimulai dengan `%.250s') terlalu panjang (>%d karakter)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "Ada kesalahan saat membaca %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "Ada kesalahan saat menutup %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "Ada kesalahan saat membuka %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" -msgstr "Sedang dekonfigurasi %s, sehingga kita dapat membuang %s ... \n" +msgstr "" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Sedang membuka pengganti %.250s ... \n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" -"tidak bisa menjalankan 'dpkg-deb' untuk mendapatkan arsip berkas sistem" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "ada kesalahan saat membaca keluaran tar dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" -msgstr "berkas tar dari sistem berkas terkorupsi - arsip paket terkorupsi" +msgstr "" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" -msgstr "dpkg-deb: kemungkinan 'zap' berakhiran banyak nol" +msgstr "" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" -msgstr "dpkg: PERINGATAN - tidak bisa menghapus berkas lama `%.250s': %s\n" +msgstr "" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "tidak dapat membaca direktori 'info'" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" -"versi lama paket ini memiliki nama berkas 'info' yang terlalu panjang mulai " -"dari `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" -msgstr "tidak bisa membuang berkas 'info' `%.250s' yang sudah usang" +msgstr "" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" -msgstr "tidak bisa memasang berkas 'info' (tampaknya) baru `%.150s'" +msgstr "" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "tidak bisa membuka direktori 'control' sementara" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" -"paket berisi nama berkas info 'control' yang terlalu panjang (mulai dari `" -"%.250s)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" -msgstr "info 'control' paket berisi direktori `%.250s'" +msgstr "" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" -"proses rmdir dari info 'control' paket `%.250s' mengatakan ini bukan dir" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" -msgstr "dpkg: PERINGATAN - paket %s berisi daftar sebagai berkas 'info'" +msgstr "" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" -msgstr "tidak bisa memasang berkas 'info' baru `%.250s' sebagai `%.250s'" +msgstr "" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" -msgstr "(Mencatat lenyapnya %s, yang telah diganti seutuhnya.) \n" +msgstr "" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" -msgstr "tidak bisa menghapus berkas info 'control' `%.250s' yang menghilang" +msgstr "" + +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" + +#: src/query.c:144 +msgid "Name" +msgstr "Nama" + +#: src/query.c:144 +msgid "Version" +msgstr "Versi" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Keterangan" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Tidak ada paket yang cocok dengan %s. \n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "Dialihkan oleh %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "Pengalihan lokal" + +#: src/query.c:218 +msgid "to" +msgstr "ke" + +#: src/query.c:218 +msgid "from" +msgstr "dari" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s tidak ada. \n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Paket `%s' tidak tersedia. \n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Paket `%s' tidak terpasang. \n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "dialihkan secara lokal" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "paket mengalihkan yang lain" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "Dialihkan oleh %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " ke: %s \n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Cara Pakai: " + +#: src/query.c:449 +#, c-format +msgid "" +" [ ...\n" @@ -2283,11 +2230,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2407,7 +2350,7 @@ msgstr "" "Usa 'dselect' o 'aptitude' se vuoi un'interfaccia semplice per la gestione\n" "dei pacchetti.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2432,17 +2375,17 @@ msgstr "" "Le opzioni marcate con [*] producono molto output - utilizza una pipe con\n" "`less' o `more' per leggerlo!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "le azioni --%s e --%s sono in conflitto" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Attenzione: opzione obsoleta `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2479,29 +2422,29 @@ msgstr "" "Debugging options are be mixed using bitwise-or.\n" "Note that the meanings and values are subject to change.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug richiede un numero in base otto come parametro" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "uno dei nomi di pacchetto separati da virgole nella lista data a --ignore-" "depends `%.250s' è nullo" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends richiede un nome di pacchetto legale. `%.250s' non lo è; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "numero intero non valido per l'opzione --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2590,62 +2533,62 @@ msgstr "" "seriamente la vostra installazione.\n" "Le opzioni contrassegnate da [*] sono abilitate di default.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opzione force/refuse sconosciuta: `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "impossibile fare malloc in execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "impossibile fare strdup in execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "impossibile eseguire %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd accetta un parametro, non nessuno" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd accetta un solo parametro" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "numero non valido in --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "impossibile aprire `%i' per ricevere il flusso" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inaspettato prima della fine della linea %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "è necessaria una opzione che indichi che azione svolgere" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending non accetta alcun parametro che non sia un'opzione" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s richiede il nome di almeno un pacchetto come parametro" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2653,12 +2596,12 @@ msgstr "" "devi specificare i pacchetti con il loro nome, non riportando il nome dei " "file che li contengono" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Il pacchetto %s è indicato più volte, processato una sola.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2667,83 +2610,80 @@ msgstr "" "Più di una copia del pacchetto %s è stata spacchettata\n" " durante questa sessione ! Viene configurato una sola volta.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Il pacchetto " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " che fornisce " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " sta per essere rimosso.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " La versione di " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " nel sistema è " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: verrà configurato anche `%s' (richiesto da `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " non è ancora configurato.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " non è installato.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; comunque:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "impossibile accedere all'archivio" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "impossibile assicurarsi che `%.250s' non esista" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "impossibile eseguire dpkg-split per verificare se si tratta di un multipart" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "l'attesa per dpkg-split è fallita" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "file del pacchetto riassemblato" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Accerto l'autenticità di %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "esecuzione di execl debsign-verify fallita" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verifica del pacchetto %s fallita!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2752,34 +2692,33 @@ msgstr "" "Verifica del pacchetto %s fallita,\n" "ma lo installo lo stesso come richiesto.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "passata\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "impossibile ottenere un filename unico per le info di controllo" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "" "impossibile eseguire dpkg-deb per estrarre le informazioni di controllo" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "" "Le informazioni relative a %s provenienti da %s sono state registrate.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "" "il pacchetto è per una architettura (%s) diversa da quella del sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2788,149 +2727,329 @@ msgstr "" "dpkg: problemi con le pre-dipendenze di %s, contenente %s:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problemi con le pre-dipendenze - non installerò %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: attenzione - problemi con le pre-dipendenze ignorati !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Mi preparo a sostituire %s %s (con %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Spacchetto %s (da %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "il nome del file di configurazione (che inizia per `%.250s')\n" " è troppo lungo (> di %d caratteri)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "errore di lettura da %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "errore chiudendo %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "errore cercando di aprire %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "De-configuro %s, per poter rimuovere %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Spacchetto il rimpiazzo di %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "impossibile eseguire dpkg-deb per estrarre l'archivio in formato tar" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "errore leggendo il file tar prodotto da dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "il file tar è rovinato - l'archivio del pacchetto è rovinato" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: rimozione di possibili caratteri nulli terminali" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "" "dpkg: attenzione - impossibile cancellare il vecchio file `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "impossibile leggere la directory info" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "la vecchia versione del pacchetto ha un file di info con un nome oltremodo " "lungo che inizia per `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "impossibile rimuovere il file di info obsoleto `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" "impossibile installare il nuovo (o supposto tale) file di info `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "impossibile aprire la directory di controllo temporanea" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "il pacchetto contiene un file di controllo con un nome oltremodo lungo " "(inizia per `%.250s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "le info di controllo del pacchetto contengono la directory `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "la rimozione (rmdir) di `%.250s' nelle info di controllo del pacchetto non " "ha segnalato che non si trattava di una directory" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg: attenzione - il pacchetto %s contiene una lista come file di " "informazioni" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "impossibile installare il nuovo file di info `%.250s' come `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Noto la scomparsa di %s, che è stato sostituito completamente.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "impossibile cancellare il file con le info di controllo `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desiderato=sconosciUto/Installato/Rimosso/P:eliminato/H:bloccato\n" +"| Stato=Non/Installato/file Config./U:spacchett./conf. Fallita/H:inst." +"parzial.\n" +"|/ Err?=(nessuno)/H:bloc./necess.Reinst./X=entrambi (Stato,Err: maiusc." +"=grave)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nome" + +#: src/query.c:144 +msgid "Version" +msgstr "Versione" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descrizione" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Nessun pacchetto corrisponde a %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "diversificato da %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "diversione locale" + +#: src/query.c:218 +msgid "to" +msgstr "a" + +#: src/query.c:218 +msgid "from" +msgstr "da" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search richiede almeno un modello di nome come parametro" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s non trovato.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Il pacchetto `%s' non è installato e non è disponibile alcuna informazione.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Il pacchetto `%s' non è disponibile.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Il pacchetto `%s' non è installato.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Il pacchetto `%s' non contiene nessun file (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "diversificato localmente" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "diversifica altri" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "diversificato da %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " a: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Usa dpkg --info (= dpkg-deb --info) per esaminare i file archivio,\n" +"e dpkg --contents (= dpkg-deb --contents) per mostrarne il contenuto.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' strumento per esaminare la situazione dei pacchetti\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Uso: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2219,11 +2167,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2339,7 +2283,7 @@ msgstr "" "¥æ¡¼¥¶¸þ¤±¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥Ä¡¼¥ë¤Ç¤¢¤ë`dselect' ¤Þ¤¿¤Ï `aptitude' ¤ò»È¤¤¤Þ¤·¤ç" "¤¦¡£\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2362,17 +2306,17 @@ msgstr "" "[*]¤Î¤¢¤ëʪ¤ÏÂçÎ̤ξðÊ󤬽ÐÎϤµ¤ì¤Þ¤¹¡£¥Ñ¥¤¥×¤ò»È¤¤`less'¤ä`more'¤Ç¸«¤Þ¤·¤ç" "¤¦!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "¥¢¥¯¥·¥ç¥ó --%s ¤È --%s ¤¬¶¥¹ç¤·¤Þ¤¹¡£" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "·Ù¹ð: ¸Å¤¤¥ª¥×¥·¥ç¥ó `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2409,28 +2353,28 @@ msgstr "" "¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó¤Ï¥Ó¥Ã¥ÈËè¤Î OR ±é»»¤Çº®¹ç¤µ¤ì¤Þ¤¹¡£\n" "¤½¤Î°ÕÌ£¤äÃͤÏÊѹ¹¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug ¤Ï 8 ¿Ê¿ô¤Î°ú¿ô¤¬¤Ò¤È¤ÄɬÍפǤ¹¡£" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "--ignore-depends ¤Î°ú¿ô(¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¥ê¥¹¥È)`%.250s'¤Ë¶õ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends ¤ÏÀµÅö¤Ê¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òɬÍפȤ·¤Þ¤¹¡£`%.250s' ¤ÏÉÔÀµ¤Ç¤¹; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "--%s ¤ËÂФ¹¤ëÉÔÀµ¤ÊÀ°¿ô¤Ç¤¹: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2504,62 +2448,62 @@ msgstr "" "·Ù¹ð:[!]¤Î¤¢¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤ¹¤ë¤È¡¢¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¿¼¹ï¤Ê¥À¥á¡¼¥¸¤ò\n" "¼õ¤±¤ë¾ì¹ç¤¬¤¢¤ë¡£[*]¤Î¤Ä¤¤¤¿¥ª¥×¥·¥ç¥ó¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¡£\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "ÉÔÌÀ¤Ê¶¯À©¡¦µñÈÝ(force/refuse)¥ª¥×¥·¥ç¥ó `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¼Â¹Ô¤Ç strdup ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd ¤Ï 1 ¤Ä¤Î°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd ¤Ï°ú¿ô¤ò 1 ¤Ä¤À¤±°ú¿ô¤ò¼è¤ê¤Þ¤¹¡£" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "--command-fd ¤Ø¤ÎÃͤ¬ÉÔÀµ¤Ç¤¹" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "`%i' ¤ò¥¹¥È¥ê¡¼¥à¤È¤·¤Æ¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "%d ¹ÔÌܤιÔËö¤Þ¤Ç¤Ëͽ´ü¤·¤Ê¤¤ eof ¤¬¤¢¤ê¤Þ¤¹¡£" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "¥¢¥¯¥·¥ç¥ó¤ò»ØÄꤹ¤ë¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending ¤Ï¥ª¥×¥·¥ç¥ó°Ê³°¤Î°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó¡£" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s ¤Ï°ú¿ô¤Ë¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬É¬ÍפǤ¹¡£" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2568,12 +2512,12 @@ msgstr "" "¤¯¡¢\n" "¥Ñ¥Ã¥±¡¼¥¸Ì¾¤½¤Î¤â¤Î¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬Ê£¿ô²óÎóµó¤µ¤ì¤Þ¤·¤¿¡¢1 ÅÙ¤À¤±½èÍý¤·¤Þ¤¹¡£\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2582,84 +2526,81 @@ msgstr "" "¸½ºß¤Î¼Â¹ÔÃæ¤Ë¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥³¥Ô¡¼¤¬Ê£¿ôŸ³«¤µ¤ì¤Þ¤·¤¿!\n" "1 ²ó¤À¤±ÀßÄê¤ò¹Ô¤¤¤Þ¤¹¡£\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " ¥Ñ¥Ã¥±¡¼¥¸ " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " ¤¬: " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " ¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¤¬¡¢ºï½ü¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " ¥·¥¹¥Æ¥à¤Î" -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr "¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: (`%2$s'¤Ë¤è¤êÍ׵ᤵ¤ì¤ë)`%1$s'¤âÀßÄꤷ¤Æ¤¤¤Þ¤¹¡£\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " ¤Ï¤Þ¤ÀÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr " ...¤·¤«¤·:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "`%.250s'¤¬Â¸ºß¤·¤Ê¤¤¤¿¤á¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "¥Þ¥ë¥Á¥Ñ¡¼¥È¤Î°ìÉô¤Ç¤¢¤ë¤«¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë dpkg-split ¤ò¼Â¹Ô¤·¤Þ¤·¤¿¤¬¡¢¼º" "ÇÔ¤·¤Þ¤·¤¿¡£" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "dpkg-split ¤Î½ªÎ»¤Þ¤ÇÂԤƤޤ»¤ó¤Ç¤·¤¿(wait¼ºÇÔ)¡£" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "²ò¼á¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "%s ¤òǧ¾Ú¤·¤Æ¤¤¤Þ¤¹...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "debsig-verify ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2668,31 +2609,30 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¤¬¡¢\n" "Í×µáÄ̤ꥤ¥ó¥¹¥È¡¼¥ë¤ò¤ª¤³¤Ê¤¤¤Þ¤¹¡£\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "¹ç³Ê\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ëÍѤΥæ¥Ë¡¼¥¯¤Ê¥Õ¥¡¥¤¥ë̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "¥³¥ó¥È¥í¡¼¥ë¾ðÊó¤ò¼èÆÀ¤·¤è¤¦¤Ë¤â dpkg-deb ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "%s ¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤ò %s ¤«¤éÅÐÏ¿¤·¤Þ¤¹¡£\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥­¥Æ¥¯¥Á¥ã(%s)¤¬¥·¥¹¥Æ¥à(%s)¤È°ìÃפ·¤Þ¤»¤ó¡£" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2701,86 +2641,85 @@ msgstr "" "dpkg: %s ¤¬ %s ¤ò´Þ¤à¤³¤È¤ò¹Íθ¤¹¤ë¤È¡¢Àè¹Ô°Í¸¤ÎÌäÂ꤬¤¢¤ê¤Þ¤¹:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "Àè¹Ô°Í¸ÌäÂê - %.250s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤»¤ó¡£" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: ·Ù¹ð - Àè¹Ô°Í¸¤ÎÌäÂê¤ò̵»ë¤·¤Æ¤¤¤Þ¤¹!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "%s %s ¤ò(%s ¤Ç)ÃÖ´¹¤¹¤ë¤¿¤á¤Î½àÈ÷¤ò¤·¤Æ¤¤¤Þ¤¹...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "(%2$s ¤«¤é) %1$s ¤òŸ³«¤·¤Æ¤¤¤Þ¤¹...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "(`%.250s'¤Ç»Ï¤Þ¤ë)ÀßÄê¥Õ¥¡¥¤¥ë̾¤¬Ä¹¤¹¤®¤Þ¤¹(>%d ʸ»ú)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "%.250s ¤ÇÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "%.250s ¤Î¥¯¥í¡¼¥º¥¨¥é¡¼¤Ç¤¹¡£" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "%.250s ¤Î¥ª¡¼¥×¥ó¥¨¥é¡¼¤Ç¤¹¡£" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "%s ¤ÎÀßÄêºï½ü(deconfigure)¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£½¾¤Ã¤Æ %s ¤òºï½ü¤Ç¤­¤Þ¤¹ ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "%.250s ¤òŸ³«¤·¡¢ÃÖ´¹¤·¤Æ¤¤¤Þ¤¹...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤·¤è¤¦¤Ë¤â dpkg-deb ¤Î¼Â¹Ô¤¬¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "dpkg-deb tar ½ÐÎϤÎÆɤ߹þ¤ß¥¨¥é¡¼¤Ç¤¹¡£" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" "²õ¤ì¤Æ¤¤¤ë tar ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à - ¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö¤¬²õ¤ì¤Æ¤¤¤Þ" "¤¹¡£" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: ;·×¤Ê¥¼¥í¤ò¼è¤ê½ü¤­¤Þ¤¹" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: ·Ù¹ð - ¸Å¤¤¥Õ¥¡¥¤¥ë`%.250s'¤Îºï½ü¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "¾ðÊó¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤ߹þ¤á¤Þ¤»¤ó¡£" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" @@ -2788,33 +2727,33 @@ msgstr "" "¤â\n" "Ť¹¤®¤Þ¤¹" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "¸Å¤¤¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤òºï½ü¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "(¤ª¤½¤é¤¯)¿·¤·¤¤¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "°ì»þŪ¥³¥ó¥È¥í¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë(`%.50s' ¤Ç»Ï¤Þ¤ë)¥³¥ó¥È¥í¡¼¥ë¾ðÊó¥Õ¥¡¥¤¥ë̾¤Ï¤¢¤Þ¤ê¤Ë¤â" "Ť¹¤®¤Þ¤¹¡£" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥³¥ó¥È¥í¡¼¥ë¾ðÊó¤Ë¥Ç¥£¥ì¥¯¥È¥ê`%.250s'¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" @@ -2825,34 +2764,214 @@ msgstr "" # #, c-format # msgid "package control info rmdir of `%.250s' didn't say not a dir" # msgstr "`%.250s' ¤Î¥Ñ¥Ã¥±¡¼¥¸¥³¥ó¥È¥í¡¼¥ë¾ðÊó rmdir ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¤È¸À¤Ã¤Æ¤¤¤Þ¤¹" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: ·Ù¹ð - ¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬°ìÍ÷¤ò¾ðÊó¥Õ¥¡¥¤¥ë¤È¤·¤Æ´Þ¤ó¤Ç¤¤¤Þ¤·¤¿¡£" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "¿·µ¬¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤ò`%.250s'¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó¡£" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(%s ¤Ï´°Á´¤ËÃÖ´¹¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢¾Ã¤¨¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "¥³¥ó¥È¥í¡¼¥ë¾ðÊó¥Õ¥¡¥¤¥ë`%.250s'¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤áºï½ü¤Ç¤­¤Þ¤»¤ó¡£" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Í×˾=(U)ÉÔÌÀ/(I)¥¤¥ó¥¹¥È¡¼¥ë/(R)ºï½ü/(P)´°Á´ºï½ü/(H)°Ý»ý\n" +"| ¾õÂÖ=(N)̵/(I)¥¤¥ó¥¹¥È¡¼¥ëºÑ/(C)ÀßÄê/(U)Ÿ³«/(F)ÀßÄ꼺ÇÔ/(H)Ⱦ¥¤¥ó¥¹¥È¡¼" +"¥ë\n" +"|/ ¥¨¥é¡¼=(¶õÍó)̵/(H)°Ý»ý/(R)Í׺ƥ¤¥ó¥¹¥È¡¼¥ë/X=ξÊý(¾õÂÖ,¥¨¥é¡¼¤ÎÂçʸ»ú=°Û" +"¾ï)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "̾Á°" + +#: src/query.c:144 +msgid "Version" +msgstr "¥Ð¡¼¥¸¥ç¥ó" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "ÀâÌÀ" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "%s ¤Ë°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "%s ¤Ë¤è¤ëÂàÈò(diversion)" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "¥í¡¼¥«¥ë¤ÊÂàÈò(diversion)" + +#: src/query.c:218 +msgid "to" +msgstr "¼¡¤Ø" + +#: src/query.c:218 +msgid "from" +msgstr "¼¡¤«¤é" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search ¤Ï°ú¿ô¤Ë¾¯¤Ê¤¯¤È¤â 1 ¤Ä¤Î¥Õ¥¡¥¤¥ë̾¥Ñ¥¿¡¼¥ó¤¬É¬ÍפǤ¹¡£" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¾ðÊó¤¬ÍøÍÑÉÔ²Äǽ¤Ç¤¹¡£\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤ÀÍøÍѲÄǽ¤Ç¤¢¤ê¤Þ¤»¤ó¡£\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "¥Ñ¥Ã¥±¡¼¥¸ `%s' ¤Ï¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó¡£(!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "¥í¡¼¥«¥ë¤ËÂàÈò(divert)¤µ¤ì¤¿" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "¾¥Ñ¥Ã¥±¡¼¥¸¤ÎƱ̾¥Õ¥¡¥¤¥ë¤Ï¼¡¤Î̾¤ËÂàÈò¤·¤¿" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "%s ¤Ë¤è¤êÂàÈò(divert)¤µ¤ì¤¿" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " %s ¤Ø\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤ë¤¿¤á¤Ë¤Ï dpkg --info (= dpkg-deb --info)¤ò¡¢\n" +"¤½¤ÎÆâÍÆ°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï dpkg --contents (= dpkg-deb --contents)¤ò»È¤¤¤Þ" +"¤¹¡£\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥×¥í¥°¥é¥à¥¯¥¨¥ê¥Ä¡¼¥ë\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "»È¤¤Êý: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2194,11 +2142,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2304,7 +2248,7 @@ msgstr "" "\n" "사용하기 편리한 꾸러미 관리를 위해 `dselect'를 사용하십시오.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2326,17 +2270,17 @@ msgstr "" "[*]표로 표시된 옵션은 출력되는 내용이 많습니다. - `less'나 `more'를 이용하십" "시오!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "--%s 명령과 --%s 명령은 충돌합니다" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "경고: `--%s' 옵션은 더 이상 사용하지 않습니다\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2373,30 +2317,30 @@ msgstr "" "디버깅 옵션은 OR 비트 연산으로 조합합니다.\n" "각각의 의미와 값은 향후 바뀔 수 있습니다.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug 옵션에는 8진수 인수가 필요합니다" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "--ignore-depends 옵션의 (쉼표로 구분한) 목록에 (`%.250s') 꾸러미 이름이 없습" "니다" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends 옵션에는 올바른 꾸러미 이름이 필요합니다. `%.250s' 꾸러미는 " "올바르지 않습니다: %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "--%s 옵션에 숫자가 잘못되었습니다: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2467,74 +2411,74 @@ msgstr "" "경고 - [!]가 붙은 옵션을 사용하면 설치 상태를 심각하게 망가질 수 있습니다.\n" "[*]가 표시된 강제 옵션은 기본값으로 켜집니다.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "알 수 없는 force/refuse 옵션 `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "execbackend에서 malloc할 수 없습니다" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "execbackend에서 strdup할 수 없습니다" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "%s 실행이 실패했습니다" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd 옵션은 0개가 아니라 1개의 인수를 받습니다" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd 옵션은 정확히 1개의 인수만 받습니다" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "--command-fd 옵션에 번호가 올바르지 않습니다" # fdopen() 실패 상황 -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "명령 옵션이 필요합니다" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending에서는 옵션과 관계없는 인수를 받지 않습니다" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s 옵션은 적어도 하나의 꾸러미 이름 인수가 필요합니다" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "꾸러미를 꾸러미 이름으로 지정해야 합니다. 꾸러미 파일 이름이 아닙니다" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "%s 꾸러미가 두 번 이상 등장했습니다. 한 번만 처리합니다.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2544,87 +2488,84 @@ msgstr "" "설정은 한 번만 합니다.\n" # FIXME: bad msgid -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " 꾸러미 " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr ", 다음을 제공함: " # FIXME: bad msgid -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " 꾸러미는 지워야 합니다.\n" # FIXME: bad msgid -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " 버전: " # FIXME: bad msgid -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " (시스템에 있는) " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: `%s'도 설정합니다 (`%s'때문에 필요)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " 꾸러미는 아직 설정하지 않았습니다.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " 꾸러미는 설치하지 않았습니다.\n" # FIXME: bad msgid -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ": 하지만:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "아카이브에 접근할 수 없습니다" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "`%.250s' 파일을 지우는 데 오류가 발생했습니다" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "다중 구성 파일의 일부인지 알아보기 위해 dpkg-split을 실행하는 데 실패했습니다" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "dpkg-split를 wait하는 데 실패했습니다" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "다시 합친 꾸러미 파일" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "%s 꾸러미를 확인하는 중입니다 ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "debsig-verify 실행이 실패했습니다" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "%s 꾸러미 확인이 실패했습니다!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2633,31 +2574,30 @@ msgstr "" "%s 꾸러미 확인이 실패했습니다,\n" "하지만 요청한 대로 설치합니다.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "통과\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "control 정보에서 유일한 파일이름을 얻을 수 없습니다" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "control 정보를 ë¹¼ 내기 위해 dpkg-deb을 실행할 수 없습니다" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "%2$s에서 %1$s에 관한 정보를 기록합니다.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "꾸러미의 아키텍처(%s)는 시스템(%s)ê³¼ 맞지 않습니다." -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2666,152 +2606,331 @@ msgstr "" "dpkg: %2$s을(를) 담고 있는 %1$s 꾸러미를 고려할 때, 선의존 문제가 있습니다:\n" "%3$s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "선의존 문제 - %.250s 꾸러미를 설치할 수 없습니다" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: 경고 - 선의존 문제를 무시합니다 !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "%s %s 꾸러미를 대체할 준비하는 중입니다 (%s 사용) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "%s 꾸러미를 푸는 중입니다 (%s에서) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "설정파일의 이름(`%.250s'(으)로 시작)이 너무 깁니다 (> %d 문자)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "%.250s에서 읽기 오류가 발생했습니다" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "%.250s을(를) 닫기 오류가 발생했습니다" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "%.250s을(를) 열기 시도하는 데 오류가 발생했습니다" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "%2$s을(를) 지우기 위해 %1$s을(를) 설정 해제하는 중입니다 ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "대체되는 %.250s 꾸러미를 푸는 중입니다 ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "파일시스템 아카이브를 얻기 위해 dpkg-deb을 실행할 수 없습니다" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "dpkg-deb tar 출력을 읽는 데 오류가 발생했습니다" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "망가진 파일 시스템 tar 파일 - 망가진 꾸러미 아카이브" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: 뒤에 나오는 0을 잘라 버립니다" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: 경고 - 오래된 파일 `%.250s'을(를) 지울 수 없습니다: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "정보 디렉토리를 읽을 수 없습니다" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "꾸러미의 과거 버전에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 " "깁니다." -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "과거 정보 파일 `%.250s' 파일을 지울 수 없습니다" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "새 (예상) 정보 파일 `%.250s' 파일을 설치할 수 없습니다" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "임시 컨트롤 디렉토리를 열 수 없습니다" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "꾸러미에 들어 있는 정보 파일의 이름이 (`%.250s'(으)로 시작) 너무 깁니다." -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "꾸러미 컨트롤 정보에 `%.250s' 디렉토리가 들어 있습니다" # FIXME: bad msgid -- to technical term (NOTADIR) -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "꾸러미 컨트롤 정보 `%.250s'의 rmdir에서 디렉토리가 아니라는 결과가 나오지 않" "았습니다" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: 경고 - %s 꾸러미는 정보 파일로 목록이 들어 있습니다" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "새 정보 파일 `%.250s'을(를) `%.250s'(으)로 설치할 수 없습니다" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" "(%s 꾸러미가 없어진 것에 유의하십시오. 완전히 다른 꾸러미로 대체되었습니" "다.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "지워야 할 컨트롤 정보 파일 `%.250s'을(를) 지울 수 없습니다" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"희망상태=알수없음(u)/설치(i)/지우기(r)/깨끗이(p)/고정(h)\n" +"| 상태=설치안됨(n)/설치됨(i)/설정(c)/풀림(u)/설정실패(f)/일부설치(h)\n" +"|/ 오류?=(없음)/고정(h)/다시설치필요(r)/둘-다(x) (상태, 오류가 대문자=불량)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "이름" + +#: src/query.c:144 +msgid "Version" +msgstr "버전" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "설명" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "%s에 맞는 꾸러미가 없습니다.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "%s에 의해 전환" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "로컬 전환" + +#: src/query.c:218 +msgid "to" +msgstr "다음으로:" + +#: src/query.c:218 +msgid "from" +msgstr "다음에서:" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search 옵션은 적어도 하나의 파일 이름 패턴 인수가 필요합니다" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s이(가) 없습니다.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "`%s' 꾸러미는 설치하지 않았으며 정보도 없습니다.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "`%s' 꾸러미는 사용할 수 없습니다.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "`%s' 꾸러미는 설치하지 않았습니다.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "`%s' 꾸러미에는 어떠한 파일도 들어 있지 않습니다. (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "로컬에서 전환" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "이 꾸러미가 다른 꾸러미를 전환" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "%s 꾸러미가 이 꾸러미를 전환" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " 다음으로: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"아카이브 파일 정보를 보려면 dpkg --info를 실행하시고 (= dpkg-deb --info)\n" +"아카이브 내용을 보려면 dpkg --contents를 실행하십시오 (= dpkg-deb --" +"contents)\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "데비안 `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' 꾸러미 관리 프로그램 질의 도구\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "사용법: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2192,11 +2140,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2316,7 +2260,7 @@ msgstr "" "\n" "Bruk «dselect» for en litt mer brukervennlig pakkehÃ¥ndtering.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2341,17 +2285,17 @@ msgstr "" "Valg markert med [*] gir mye tekst - bruk «less» eller «more» for Ã¥ lese " "informasjonen!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "handlinger i konflikt --%s og --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Advarsel: Foreldet opsjon «%s»\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2390,27 +2334,27 @@ msgstr "" "Avlusingsopsjonene kan kombineres med logisk eller.\n" "Legg merke til at betydninger og verdier kan bli endret.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "-- debug krever en oktal parameter" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "tomt pakkenavn i den kommadelte lista til --ignore-depends «%.250s»" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ugyldig heltall for --%s: «%.250s»" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2486,74 +2430,74 @@ msgstr "" "ADVARSEL - Funksjoner merket med [!] kan ødelegge installasjonen alvorlig.\n" "Opsjoner som er merket med [*] er slÃ¥tt pÃ¥ som standard.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "ukjent tvangs-/avvisningsopsjon «%.*s»" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "klarte ikke utføre «malloc» i execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "klarte ikke utføre «strdup» i execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "klarte ikke kjøre %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd tar ett argument, ikke 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd tar bare ett argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ugyldig tall for --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "klarte ikke Ã¥pne «%i» for strøm" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "uventet slutt pÃ¥ fil før slutten av linje %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "trenger et handlingsvalg" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending tar ingen argumenter som ikke er opsjoner" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s trenger minst ett pakkenavn som parameter" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" "du mÃ¥ gi selve navnet pÃ¥ pakkene, ikke navnene pÃ¥ filene som pakkene ligger i" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pakken %s er nevnt flere ganger, behandler bare én gang.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2562,84 +2506,81 @@ msgstr "" "Flere kopier av pakken %s er pakket ut i denne\n" " omgangen. Setter bare opp én gang.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pakken " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " som tilbyr " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " skal fjernes.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versjonen av " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " pÃ¥ systemet er " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: setter ogsÃ¥ opp «%s» (krevet av «%s»)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " er ikke satt opp ennÃ¥.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " er ikke installert.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ". Men:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "fÃ¥r ikke tilgang til arkivet" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "klarte ikke sikre at «%.250s» ikke finnes" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "klarte ikke kjøre «dpkg-split» for Ã¥ se om pakken er en del av en flerdelt " "pakke" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "venting pÃ¥ «dpkg-split» mislyktes" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "pakkefil satt sammen igjen" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Godkjenner %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "klarte ikke kjøre debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verifisering av pakka %s mislyktes!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2648,31 +2589,30 @@ msgstr "" "Verifisering av pakka %s mislyktes,\n" "men installerer likevel siden du ønsker det.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "godkjent\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "klarte ikke fÃ¥ unikt filnavn for kontrollinformasjon" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "klarte ikke kjøre «dpkg-deb» for Ã¥ hente ut kontrollinformasjon" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Tatt vare pÃ¥ informasjon om %s fra %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "pakkearkitekturen (%s) passer ikke til systemet (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2681,140 +2621,321 @@ msgstr "" "dpkg: Vedrørende %s som inneholder %s, problem med førkrav:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problem med førkrav - installerer ikke %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: Advarsel - ignorerer problem med førkrav.\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Gjør klar til Ã¥ bytte ut %s %s (ved bruk av %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Pakker ut %s (fra %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "navnet pÃ¥ oppsettsfila (starter med «%.250s») er for langt (>%d tegn)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "lesefeil i %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "feil ved lukking av %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "feil ved Ã¥pning av %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Fjerner oppsettet av %s, slik at %s kan fjernes ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Pakker ut erstatningen %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "klarte ikke kjøre «dpkg-deb» for Ã¥ hente filsystemarkiv" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "feil ved lesing av tar-utdata fra dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: Fjern eventuelle avsluttande nuller" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: Advarsel - klarte ikke slette den gamle fila «%.250s»: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "klarte ikke lese infokatalogen" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "den gamle versjonen av pakken har et altfor langt filnavn som startar pÃ¥ " "«%.250s»" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "klarte ikke fjerne den foreldede informasjonsfila «%.250s»" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "klarte ikke installere den (visstnok) nye informasjonsfila «%.250s»" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "klarte ikke Ã¥pne den midlertidige kontrollkatalogen" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "pakken inneholder et altfor langt informasjonsfilnavn (starter med «%.50s»)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "pakkekontrollinformasjonen inneholder katalogen «%.250s»" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikke «ingen katalog»" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: Advarsel - pakken %s inneholder en liste som informasjonsfil" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "klarte ikke installere ny informasjonsfil «%.250s» som «%.250s»" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Legg merke til at %s er forsvunnet, og fullstendig erstattet.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "klarte ikke slette den forsvinnende kontrollinformasjonsfila «%.250s»" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Ønsket=Ukjent/Installer/Fjern/Rens ut/Hold tilbake\n" +"| Status=Ikke/Installert/Oppsettsfiler/Utpakket/Oppsettsfeil/Halvinstallert\n" +"|/ Feil?=(ingen)/Holdt tilbake/MÃ¥ inst. pÃ¥ nytt/X=begge-deler (Status,Feil: " +"versalar=dumt)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Navn" + +#: src/query.c:144 +msgid "Version" +msgstr "Versjon" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Beskrivelse" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Fant ingen pakker som passer til «%s».\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "omdirigert med %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokal omdirigering" + +#: src/query.c:218 +msgid "to" +msgstr "til" + +#: src/query.c:218 +msgid "from" +msgstr "fra" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search krever minst ett filnavnsmønster som parameter" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: fant ikke %s.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Pakken «%s» er ikke installert og det finnes ingen informasjon om den.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pakken «%s» er ikke tilgjengelig.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pakken «%s» er ikke installert.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pakken «%s» inneholder ingen filer (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalt omdirigert" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pakken omdirigerer andre" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "omdirigert av %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " til: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Bruk dpkg --info (= dpkg-deb --info) for Ã¥ undersøke arkivfiler,\n" +"og dpkg --contents (= dpkg-deb --contents) for Ã¥ vise innholdet i dem.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian «" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "» pakkehÃ¥ndteringsprogram og spørreverktøy\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Bruk: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2218,11 +2166,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2335,7 +2279,7 @@ msgstr "" "\n" "Gebruik `dselect' voor gebruikersvriendelijk pakketbeheer.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2360,17 +2304,17 @@ msgstr "" "Opties gemarkeerd met [*] produreren een hoop uitvoer - pijp het door `less' " "of `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "tegenstrijdige acties --%s en --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Let op: verouderde optie `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2407,28 +2351,28 @@ msgstr "" "Debug-opties kunnen worden gecombineerd met bitsgewijze of.\n" "Merk op dat de betekenissen en waarden kunnen veranderen.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug vereist een octaal argument" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ongeldig getal voor --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2515,62 +2459,62 @@ msgstr "" "ernstig beschadigen.\n" "Forceeropties gemarkeerd met [*] staan standaard aan.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "onbekende force/refuse optie `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "kon geen geheugen reserveren in exec-backend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "strdup is mislukt in exec-backend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "kon %s niet uitvoeren" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd verwacht een argument, niet nul" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd verwacht slechts één argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ongeldig nummer voor --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "kon `%i' niet openen voor stream" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "onverwacht bestandseinde voor einde regel %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "heb een actie-optie nodig" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending accepteert geen niet-optie argumenten" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s heeft ten minste een pakketnaam argument nodig" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2578,12 +2522,12 @@ msgstr "" "u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam " "van het bestand waar ze inzitten" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pakket %s is meer dan eens gegeven, slechts een keer behandeld.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2592,84 +2536,81 @@ msgstr "" "Meer dan een kopie van pakket %s is uitgepakt in deze ronde!\n" " Wordt slechts een keer geconfigureerd.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pakket " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " die voorziet in " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " wordt verwijderd.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versie van " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " op het systeem is " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: ook `%s' wordt geconfigureerd (vereist door `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " is nog niet geconfigureerd.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " is niet geïnstalleerd.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; maar:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "kon archief niet benaderen" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "fout bij verifiëren dat `%.250s' niet bestaat" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "kon dpkg-split niet uitvoeren om te zien of het een onderdeel is van " "meerdere delen" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "wachten op dpkg-split is mislukt" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "pakketbestand weer samengesteld" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Authenticeren van %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "uitvoeren van debsig-verify is mislukt" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verificatie van pakket %s is mislukt!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2678,31 +2619,30 @@ msgstr "" "Verificatie van pakket %s is mislukt,\n" "maar wordt toch geïnstalleerd zoals gevraagd.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "correct\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "kon geen unieke bestandsnaam krijgen voor besturingsinformatie" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "kon dpkg-deb niet uitvoeren om besturingsinformatie te extraheren" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Informatie over %s uit %s is opgenomen.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "pakket-architectuur (%s) komt niet overeen met het systeem (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2711,141 +2651,320 @@ msgstr "" "dpkg: voor-vereistenprobleem met %s dat %s bevat:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "voor-vereistenprobleem - %.250s wordt niet geïnstalleerd" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: waarschuwing - voorafhankelijkheisprobleem wordt genegeerd !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Voorbereiden om %s %s te vervangen (met %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Uitpakken van %s (uit %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "leesfout in %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "fout bij sluiten van %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "fout bij openen van %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "De-configureren van %s, zodat %s verwijderd kan worden ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Uitpakken van vervangende %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "kon dpkg-deb niet uitvoeren om bestandssysteem-archief te krijgen" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "fout bij lezen van dpkg-deb tar uitvoer" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "beschadigd bestandssysteem tarbestand - beschadigd pakketarchief" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: zap mogelijke nakomende nullen" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: waarschuwing - kon oud bestand `%.250s' niet verwijderen: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "kon info map niet lezen" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "kon verouderd infobestand `%.250s' niet verwijderen" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "kon (waarschijnlijk) nieuwe infobestand `%.250s' niet installeren" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "kon tijdelijke besturingsmap niet openen" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "bestandsnaam van het 'control'-infobestand van dit pakket is te lang " "(beginnend met `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "pakket 'control'-infobestand bevat map `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "rmdir van pakket besturingsinfo `%.250s' zei niet dat het geen map is" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: waarschuwing - pakket %s bevat een lijst als infobestand" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "kon nieuwe infobestand `%.250s' niet installeren als `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Verdwijning van %s is opgemerkt, het is totaal vervangen is.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "kon oude verdwijnende besturings infobestand `%.250s' niet verwijderen" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Gewenst=(U)Onbekend/Installeren/Remove/Purge/Hold\n" +"| Status=Niet/geInstalleerd/Config/Uitgepakt/(F)config-mislukt/Half-geinst\n" +"|/ Fout?=(geen)/Hold/Reinst nodig/X=beide (Status,Fout: hoofdlett=ernstig)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Naam" + +#: src/query.c:144 +msgid "Version" +msgstr "Versie" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Omschrijving" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Geen pakketten gevonden overeenkomend met %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "verwijzing door %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokale verwijzing" + +#: src/query.c:218 +msgid "to" +msgstr "naar" + +#: src/query.c:218 +msgid "from" +msgstr "van" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search heeft ten minste een bestandsnaam patroon argument nodig" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s niet gevonden.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Pakket `%s' is niet geïnstalleerd en geen info is beschikbaar.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pakket `%s' is niet beschikbaar.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pakket `%s' is niet geïnstalleerd.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pakket `%s' bevat geen bestanden (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokaal omgeleid" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pakket leidt andere om" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "omgeleid door %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " naar: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken,\n" +"en dpkg --contents (= dpkg-deb --contents) om de inhoud weer te geven.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian GNU/Linux `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' beheerprogramma voor pakketten versie\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Gebruik: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2201,11 +2149,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2326,7 +2270,7 @@ msgstr "" "\n" "Bruk «dselect» for ei litt meir brukarvennleg pakkehandtering.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2351,17 +2295,17 @@ msgstr "" "Val markert med [*] gjev mykje tekst - bruk «less» eller «more» for Ã¥ lesa " "informasjonen." -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "handlingar i konflikt --%s og --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Åtvaring: Forelda val «%s»\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2400,27 +2344,27 @@ msgstr "" "Avlusingsvala kan kombinerast med logisk eller.\n" "Legg merke til at tydingane og verdiane kan verta endra.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "-- debug krev ein oktal parameter" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "tomt pakkenamn i den kommadelte lista til --ignore-depends «%.250s»" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends krev eit gyldig pakkenamn. «%.250s» er ikkje gyldig; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ugyldig heiltal for --%s: «%.250s»" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2499,74 +2443,74 @@ msgstr "" "alvorleg.\n" "Vala som er merkte med [*] er slÃ¥tt pÃ¥ som standard.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "ukjend tvingings-/avvisingsval «%.*s»" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "klarte ikkje utføra «malloc» i execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "klarte ikkje utføra «strdup» i execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "klarte ikkje køyra %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd tek éin parameter, ikkje null" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd tek berre ein parameter" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ugyldig tal for --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "klarte ikkje opna «%i» for straum" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "uventa slutt pÃ¥ fil før slutten av linje %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "treng eit handlingsval" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending tek ingen ikkje-valparametrar" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s treng minst eitt pakkenamn som parameter" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" "du mÃ¥ gi sjølve namnet pÃ¥ pakkane, ikkje namna pÃ¥ filene som pakkane ligg i" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pakken %s er nemnt fleire gonger, behandlar berre éin gong.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2575,84 +2519,81 @@ msgstr "" "Fleire kopiar av pakken %s er pakka ut i denne\n" " omgangen. Set berre opp éin gong.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pakken " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " som tilbyr " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " vil bli fjerna.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versjonen av " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " pÃ¥ systemet er " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: set òg opp «%s» (kravd av «%s»)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " er ikkje sett opp enno.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " er ikkje installert.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ". Men:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "fÃ¥r ikkje tilgang til arkivet" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "klarte ikkje sikra at «%.250s» ikkje finst" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "klarte ikkje køyra «dpkg-split» for Ã¥ sjÃ¥ om pakken er ein del av ein " "fleirdelt pakke" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "ventinga pÃ¥ «dpkg-split» mislukkast" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "pakkefil sett saman att" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Godkjenner %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "klarte ikkje køyra debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Stadfestinga av %s mislukkast." -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2661,31 +2602,30 @@ msgstr "" "Stadfestinga av %s mislukkast,\n" "men installerer likevel sidan du ønskjer det.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "godkjent\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "klarte ikkje fÃ¥ unikt filnamn for kontrollinformasjon" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "klarte ikkje køyra «dpkg-deb» for Ã¥ henta ut kontrollinformasjon" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Teke vare pÃ¥ informasjon om %s frÃ¥ %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "pakkearkitekturen (%s) passar ikkje til systemet (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2694,140 +2634,321 @@ msgstr "" "dpkg: Vedrørande %s som inneheld %s, problem med førkrav:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problem med førkrav - installerer ikkje %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: Åtvaring - ignorerer problem med førkrav.\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Gjer klar til Ã¥ byta ut %s %s (ved bruk av %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Pakkar ut %s (frÃ¥ %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "namnet pÃ¥ oppsettsfila (startar med «%.250s») er for langt (>%d teikn)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "lesefeil i %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "feil ved lukking av %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "feil ved opning av %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Fjernar oppsettet av %s, slik at %s kan fjernast ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Pakkar ut erstattinga %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "klarte ikkje køyra «dpkg-deb» for Ã¥ henta filsystemarkiv" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "feil ved lesing av tar-utdata frÃ¥ dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "øydelagd filsystem-tarfil - øydelagt pakkearkiv" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: Fjern eventuelle avsluttande nullar" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: Åtvaring - klarte ikkje sletta den gamle fila «%.250s»: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "klarte ikkje lesa infokatalogen" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "den gamle versjonen av pakken har eit altfor langt filnamn som startar pÃ¥ " "«%.250s»" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "klarte ikkje fjerna den forelda informasjonsfila «%.250s»" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "klarte ikkje installera den (visstnok) nye informasjonsfila «%.250s»" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "klarte ikkje opna den mellombelse kontrollkatalogen" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "pakken inneheld eit altfor langt informasjonsfilnamn (startar med «%.50s»)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "pakkekontrollinformasjonen inneheld katalogen «%.250s»" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "pakkekontrollinformasjon, rmdir av «%.250s» sa ikkje «ingen katalog»" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: Åtvaring - pakken %s inneheld ei liste som informasjonsfil" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "klarte ikkje installera ny informasjonsfil «%.250s» som «%.250s»" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Legg merke til at %s er forsvunnen, og fullstendig erstatta.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "klarte ikkje sletta den forsvinnande kontrollinformasjonsfila «%.250s»" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Ønskt=Ukjend/Installer/Fjern/Reinsk ut/Heldt tilbake\n" +"| Status=Ikkje/Installert/Oppsettsfiler/Utpakka/Oppsettsfeil/Halvinstallert\n" +"|/ Feil?=(ingen)/Heldt tilbake/MÃ¥ inst. pÃ¥ nytt/X=begge-delar (Status,Feil: " +"versalar=dumt)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Namn" + +#: src/query.c:144 +msgid "Version" +msgstr "Versjon" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Skildring" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Fann ingen pakkar som passar til «%s».\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "omdirigert med %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokal omdirigering" + +#: src/query.c:218 +msgid "to" +msgstr "til" + +#: src/query.c:218 +msgid "from" +msgstr "frÃ¥" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search krev minst eitt filnamnsmønster som parameter" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: fann ikkje %s.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Pakken «%s» er ikkje installert og det finst ingen informasjon om han.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pakken «%s» er ikkje tilgjengeleg.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pakken «%s» er ikkje installert.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pakken «%s» inneheld ingen filer (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalt omdirigert" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pakken omdirigerer andre" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "omdirigert av %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " til: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Bruk dpkg --info (= dpkg-deb --info) for Ã¥ undersøkja arkivfiler,\n" +"og dpkg --contents (= dpkg-deb --contents) for Ã¥ visa innhaldet i dei.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian «" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "» pakkehandteringsprogram\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Bruk: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2215,11 +2162,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2334,7 +2277,7 @@ msgstr "" "U¿yj `dselect' je¶li potrzebujesz wygodnego programu do zarz±dzania " "pakietami.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2358,17 +2301,17 @@ msgstr "" "\n" "Opcje oznaczone [*] podaj± du¿o tre¶ci - skieruj potok na `less' lub `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "konflikt miêdzy dzia³aniem --%s i --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Uwaga: niewykorzystywana ju¿ opcja `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2406,28 +2349,28 @@ msgstr "" "Opcje debuggera mog± byæ ³±czone poprzez zsumowanie poszczególnych " "warto¶ci.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug wymaga podania argumentu bêd±cego liczb± ósemkow±" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "pusta nazwa pakietu dla --ignore-depends w li¶cie `%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends wymaga podania poprawnej nazwy pakietu. `%.250s' jest " "niepoprawny; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "b³êdna warto¶æ liczbowa dla --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2504,76 +2447,76 @@ msgstr "" "UWAGA - u¿ycie opcji oznaczonej [!] mo¿e powa¿nie uszkodziæ instalacjê.\n" "Opcje oznaczone [*] s± domy¶lnie w³±czone.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "nieznana opcja force/refuse `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "malloc w execbackend nie powiod³o siê" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "strdup w execbackend nie powiod³o siê" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "wywo³anie %s nie powiod³o siê" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd wymaga 1 argumentu, nie 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd wymaga tylko 1 argumentu" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "nieprawid³owy numer przy --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "nie uda³o siê otworzyæ `%i' jako strumienia" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "niespodziewany EOF przed koñcem linii %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "nale¿y okre¶liæ dzia³anie" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending wymaga niepodawania argumentów nie bêd±cych opcj±" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s wymaga co najmniej jednej nazwy pakietu" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" "nale¿y podaæ nazwê pakietu, a nie nazwê pliku, z którego zosta³ zainstalowany" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" "Pakiet %s jest wymieniony kilkukrotnie, ale zostanie przetworzony tylko " "raz.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2582,84 +2525,81 @@ msgstr "" "Rozpakowana zosta³a wiêcej ni¿ jedna kopia pakietu %s\n" " w tym przebiegu ! Konfiguracja odbêdzie siê tylko dla jednej.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pakiet " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " który dostarcza " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " jest przeznaczony do usuniêcia.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Wersja " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " w systemie to " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: konfiguracja tak¿e dla `%s' (wymagana przez `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " nie jest jeszcze skonfigurowany.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " nie jest zainstalowany.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; jednak¿e:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "brak dostêpu do archiwum" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "nie mo¿na usun±æ `%.250s'" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "nie mo¿na wywo³aæ `dpkg-split' aby upewniæ siê czy plik nie jest czê¶ci± " "wieloczê¶ciowego zestawu" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "nie mo¿na wykonaæ funkcji `wait' dla `dpkg-split'" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "przebudowanie pliku pakietu" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Sprawdzanie %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "nie mo¿na wykonaæ `debsig-verify'" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Sprawdzenie pakietu %s nie powiod³o siê!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2668,31 +2608,30 @@ msgstr "" "Nie uda³o siê sprawdziæ pakietu %s,\n" "ale zostanie zainstalowany wed³ug ¿±dania\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "powiod³o siê\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "nie mo¿na pobraæ unikalnej nazwy pliku dla pliku kontrolnego" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "nie mo¿na wywo³aæ `dpkg-deb' aby pobraæ plik kontrolny" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Zapisane informacje o %s z %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "architektura pakietu (%s) nie zgadza siê z architektur± systemu (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2701,145 +2640,325 @@ msgstr "" "dpkg: problem z przed-zale¿no¶ciami %s zawieraj±cego %s:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problem z przed-zale¿no¶ciami - %.250s nie bêdzie instalowany" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: ostrze¿enie - zignorowanie problemu z przed-zale¿no¶ciami !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Przygotowanie do zast±pienia %s %s (wykorzystuj±c %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Rozpakowanie %s (z %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "nazwa pliku konfiguracyjnego (rozpoczynana od `%.250s') jest zbyt d³uga (>%d " "znaków)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "nie mo¿na odczytaæ %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "nie mo¿na zamkn±æ %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "nie mo¿na otworzyæ %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Dekonfiguracja %s, tak ¿e mo¿na usun±æ %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Rozpakowanie pakietu zastêpuj±cego %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "nie mo¿na wywo³aæ `dpkg-deb' aby pobraæ archiwum z plikami" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "nie mo¿na odczytaæ potoku z `dpkg-deb' zawieraj±cego archiwum tar" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "uszkodzone archiwum tar - uszkodzone archiwum pakietu" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: usuniêcie prawdopodobnych zer na koñcu" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: ostrze¿enie - nie mo¿na usun±æ poprzedniego pliku `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "nie mo¿na odczytaæ katalogu informacyjnego" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "poprzednia wersja pakietu ma plik informacyjny o zbyt d³ugiej nazwie " "rozpoczynaj±cej siê od `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "nie mo¿na usun±æ nieaktualnego pliku informacyjnego `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "nie mo¿na zainstalowaæ nowego pliku informacyjnego `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "nie mo¿na otworzyæ tymczasowego katalogu kontrolnego" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "pakiet zawiera plik kontrolny o zbyt d³ugiej nazwie (rozpoczynaj±cej siê od `" "%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "archiwum kontrolne pakietu zawiera katalog `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "próba usuniêcia katalogu `%.250s' nie wykaza³a, ¿e to nie jest katalog" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg: ostrze¿enie - pakiet %s zawiera listê plików jako plik informacyjny" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "" "nie mo¿na zainstalowaæ nowego pliku informacyjnego `%.250s' jako `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Stwierdzono znikniêcie %s, który zosta³ zupe³nie zast±piony.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "nie mo¿na usun±æ brakuj±cego pliku kontrolnego `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Wybór=U=Nieznany/I=Instalacja/R=Usuniêcie/P=Wyczyszczenie/H=Zatrzymanie\n" +"| Stan=N=Brak/I=Zainst./C=Skonfig./U=Rozpakowany/F=Nieskonfig./H=Wpó³-" +"zainst.\n" +"|/ B³êdy?=(brak)/H=Wstrzym./R=Do przeinst./X=Obydwa (Stan,B³êdy:wielk.lit." +"=¼le)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nazwa" + +#: src/query.c:144 +msgid "Version" +msgstr "Wersja" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Opis" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Nie znaleziono pakietu pasuj±cego do wzorca %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "ominiêcie przez %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokalne ominiêcie" + +#: src/query.c:218 +msgid "to" +msgstr "od" + +#: src/query.c:218 +msgid "from" +msgstr "do" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search wymaga podania co najmniej jednego wzorca pliku" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s nie odnaleziony.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Pakiet `%s' nie jest zainstalowany i informacje o nim nie s± dostêpne.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pakiet `%s' nie jest dostêpny.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pakiet `%s' nie jest zainstalowany.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pakiet `%s' nie zawiera ¿adnego pliku (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalnie ominiêty" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pakiet omija inne" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "ominiêty przez %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " do: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"U¿yj dpkg --info (= dpkg-deb --info) aby zobaczyæ informacje o pakiecie,\n" +"oraz dpkg --contents (= dpkg-deb --contents) aby sprawdziæ jego zawarto¶æ.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' narzêdzie do przeszukiwania pakietów\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "U¿ywanie: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2223,11 +2171,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2354,7 +2298,7 @@ msgstr "" "\n" "Utilize o `dselect' ou o aptitude para uma gestão de pacotes user-friendly.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2379,17 +2323,17 @@ msgstr "" "Opções marcadas com [*] produzem muita saída de texto - utilize pipes com " "`less' ou `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "acções em conflito --%s e --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "aviso: opção obsoleta `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2427,29 +2371,29 @@ msgstr "" "Opções de debug são misturadas utilizando o bitwise-or.\n" "Note que os significados e valores estão sujeitos a mudar.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug requer um argumento em octal" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nome de pacote nulo na lista separada por virgulas de --ignore-depends`" "%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends requer um nome de pacote válido. `%.250s' não o é; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "número inteiro inválido para --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2538,62 +2482,62 @@ msgstr "" "instalação.\n" "Opções para forçar marcadas com [*] são habilitadas por padrão.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opção desconhecida de forçar/recusar `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "não pode fazer malloc no execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "não pode fazer strdup no execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "falhou executar %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd leva 1 argumento, não 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-df leva apenas 1 argumento" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "número inválido para --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "não pode abrir `%i' para stream" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inesperado antes do fim da linha %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "é necessária uma opção de acção" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending não leva quaisquer argumentos não-opção" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s necessita de pelo menos um argumento de nome de pacote" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2601,12 +2545,12 @@ msgstr "" "tem de especificar pacotes pelos seus próprios nomes, não por transcrever os " "nomes dos ficheiros em que eles vêm" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pacote %s listado mais de uma vez, apenas processar uma vez.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2615,83 +2559,80 @@ msgstr "" "Foi descompactada mais que uma cópia do pacote %s\n" " nesta execução ! Apenas configurar uma vez.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pacote " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " que disponibiliza " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " está para ser removido.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versão de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " no sistema é " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: configurar também `%s' (requerido por `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " ainda não está configurado.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " não está instalado.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; no entanto:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "não pode aceder ao arquivo" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "erro assegurando que `%.250s' não existe" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "falhou executar dpkg-split para verificar se é um arquivo dividido em partes" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "a espera por dpkg-split falhou" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "ficheiro de pacote re-montado" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "A autenticar %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "falhou o execl debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "A verificação do pacote %s falhou!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2700,32 +2641,31 @@ msgstr "" "A Verificação do pacote %s falhou,\n" "mas a instalar à mesma como você requisitou.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "passou\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" "não foi possível obter nome de ficheiro único para informação de controle" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "falhou executar dpkg-deb para extrair a informaçção de controle" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Foi gravada informação sobre %s desde %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "a arquitectura do pacote (%s) não coincide com a do sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2734,155 +2674,341 @@ msgstr "" "dpkg: acerca de %s contendo %s, problema de pre-dependência:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problema de pré-dependência - não instalar %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: aviso - a ignorar problema de pré-dependência !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Preparando para substituir %s %s (a usar %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "A descompactar %s (desde %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "nome do ficheiro de configuração (começando `%.250s') é demasiado comprido (>" "%d caracteres)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "erro de leitura em %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "erro a fechar %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "erro ao tentar abrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Des-configurando %s, para que possamos remover %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "A descompactar substituto %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" "não foi possível executar o dpkg-deb para obter um arquivo do sistemade " "ficheiros." -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "erro ao ler a saída do tar de dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" "sistema de ficheiros do ficheiro tar corrompido - arquivo de pacote " "corrompido" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: zap possível rasto de zeros" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: aviso - não foi possível apagar o ficheiro antigo `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "não pode ler directório info" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "a antiga versão do pacote tem um nome de ficheiro demasiado comprido " "começando por `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "não foi possível remover o ficheiro de info obsoleto `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "não foi possível instalar (o suposto) novo ficheiro info `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "não foi possível abrir o directório temporário de controle" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "o pacote contém um ficheiro de info de control com o nome de ficheiro " "demasiado comprido (começando por `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "a informação de controle do pacote contém o directório `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "rmdir de info de controle do pacote `%.250s' não disse que não era um dir" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: aviso - o pacote %s continha lista como ficheiro info" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "não foi possível instalar o novo ficheiro info `%.250s' como `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Notando o desaparecimento de %s, que foi totalmente substituído.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "não é possível apagar ficheiro de controle info desaparecido `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desejado=U=Desconhecido/Instalar/Remover/Purgar/H=Manter\n" +"| Status=Não/Instalado/Config-files/U=Descompac/Falhou-config/H=Semi-instal\n" +"|/ Erro?=(nenhum)/H=Mantido/precisa-Reinst/X=os 2 problemas (Status,Erro: " +"maíusculas=errado)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nome" + +#: src/query.c:144 +msgid "Version" +msgstr "Versão" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descrição" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Não foram encontrados pacotes coincidindo com %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "desvio por %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desvio local" + +#: src/query.c:218 +msgid "to" +msgstr "para" + +#: src/query.c:218 +msgid "from" +msgstr "de" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"--search necessita de pelo menos um argumento de pattern de nome de ficheiro" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s não foi encontrado.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "O pacote `%s' não está instalado e não está disponível informação.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "O pacote `%s' não está disponível.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "O pacote `%s' não está instalado.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "O pacote `%s' não contém qualquer ficheiro (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "localmente desviado" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "o pacote desvia outros" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "desviado por %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " para: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo,\n" +"e dpkg --contents (= dpkg-deb --contents) para listar o seu conteúdo.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' ferramenta de query do programa de gestão de pacotes\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Utilização: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2224,11 +2172,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2354,7 +2298,7 @@ msgstr "" "\n" "Use `dselect' ou 'aptitude' para gerenciamento amigável de pacotes.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2380,17 +2324,17 @@ msgstr "" "Opções marcadas com [*] produzem muita saída de texto - passe-a por `less' " "ou `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "ações conflitantes --%s e --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Aviso: opção obsoleta `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2428,28 +2372,28 @@ msgstr "" "Opções de depuração são misturadas usando o bitwise-or.\n" "Note que os significados e valores estão sujeitos à mudanças.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug requer um argumento octal" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "nome de pacote nulo na lista separada por vírgulas `%.250s' em --ignore-" "depends" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends requer um nome de pacote válido. `%.250s' não é; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "inteiro inválido para --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2536,62 +2480,62 @@ msgstr "" "instalação.\n" "Opções para forçar marcadas com [*] são habilitadas por padrão.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "opção de forçar/recusar `%.*s' desconhecida" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "não foi possível alocar memória em execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "não foi possível fazer strdup em execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "falha ao executar %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd recebe 1 argumento, não 0" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd recebe somente 1 argumento" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "número inválido para --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "não foi possível abrir `%i' para stream" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "eof inesperado após fim da linha %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "preciso de uma opção de ação" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending não precisa de nenhum argumento que não seja opção" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s precisa de ao menos um nome de pacote como argumento" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2599,12 +2543,12 @@ msgstr "" "você precisa especificar pacotes com seus próprios nomes, não citando os " "nomes dos arquivos em que eles vêm" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Pacote %s listado várias vezes, processando apenas uma vez.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2613,84 +2557,81 @@ msgstr "" "Mais de uma cópia do pacote %s foi descompactada\n" " nessa execução ! Configurando-o apenas uma vez.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Pacote " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " que fornece " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " está para ser removido.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versão de " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " no sistema é " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: também configurando `%s' (necessário para `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " não está configurado ainda.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " não está instalado.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; porém:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "impossível acessar arquivo" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "erro ao se certificar que `%.250s' não existe" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "falha ao executar dpkg-split para ver se é parte de um arquivo dividido em " "partes" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "espera por dpkg-split falhou" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "arquivo de pacote remontado" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Autenticando %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "falha ao executar debsign-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verificação no pacote %s falhou!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2699,32 +2640,31 @@ msgstr "" "Verificação no pacote %s falhou,\n" "mas o instalarei de qualquer forma como você requisitou.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "passou\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "" "não foi possível pegar nome de arquivo único para informação de controle" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "falha ao executar dpkg-deb para extrair informação de controle" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Informação gravada sobre %s de %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "arquitetura do pacote (%s) não é a mesma do sistema (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2733,159 +2673,353 @@ msgstr "" "dpkg: quanto a %s, contendo %s, problema de pré-dependência:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problema de pré-dependência - %.250s não será instalado" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: aviso - ignorando problema de pré-dependência !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Preparando para substituir %s %s (usando %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Descompactando %s (de %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "nome do arquivo de configuração (começando `%.250s') é muito longo (maior " "que %d caracteres)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "erro de leitura em %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "erro fechando %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "erro tentando abrir %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Desconfigurando %s, para que possamos remover %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Descompactando substituto %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "" "não foi possível executar dpkg-deb para obter um arquivo do sistema de " "arquivos" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "erro lendo a saída do tar do dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "" "sistema de arquivos de arquivo tar corrompido - arquivo de pacote corrompido " # Could someone please point me a good translation for this ? -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: zap possible trailing zeros" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: aviso - não foi possível apagar arquivo antigo `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "não foi possível ler diretório info" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "versão antiga do pacote possui nome de arquivo info demasiadamente longo " "iniciando `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "não foi possível remover arquivo info obsoleto `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "não foi possível instalar arquivo info (supostamente) novo `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "não foi possível abrir diretório de controle temporário" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "pacote contém nome de arquivo de controle damasiadamente longo (iniciando `" "%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "informação de controle do pacote continha diretório `%.250s'" # Strange translation, we should improve this one. -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "remoção do diretório de informação de controle do pacote `%.250s' não disse " "que tratava-se de um diretório" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: aviso - pacote %s continha lista como arquivo info" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "não foi possível instalar novo arquivo info `%.250s' como `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "" "(Percebendo desaparecimento de %s, que foi completamente substituído.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "" "não foi possível apagar arquivo info de controle desaparecendo `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Desejado=U=Desconhecido/Instalar/Remover/aPagar/H=Manter\n" +"| status=Não/Instalado/arquiv.-Config./U=Descomp./Falhou-config/H=semi-" +"inst.\n" +"|/ Erro?=(nenhum)/H=Mantido/precisa-Reinst./X=os dois problemas (status," +"Erro: maiúsculas=ruim)\n" +"||/ Nome Versão Descrição\n" +"+++-===============-==============-" +"============================================\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Nome" + +#: src/query.c:144 +msgid "Version" +msgstr "Versão" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Descrição" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Nenhum pacote encontrado casando com %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "desvio por %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "desvio local" + +#: src/query.c:218 +msgid "to" +msgstr "para" + +#: src/query.c:218 +msgid "from" +msgstr "de" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"--search precisa de ao menos um padrão de nome de arquivo como argumento" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s não encontrado.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Pacote `%s' não está instalado e não há informações disponíveis.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Pacote `%s' não está disponível.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Pacote `%s' não está instalado.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Pacote `%s' não contém arquivos (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "localmente desviado" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "pacote desvia outros" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "desviado por %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " para: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Use dpkg --info (= dpkg-deb --info) para examinar arquivos do pacote,\n" +"e dpkg --contents (= dpkg-deb --contents) para listar seu conteúdo.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian GNU/Linux `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' ferramento de procura do programa de gerenciamento de pacotes\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Uso: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" -" dpkg --unpack <.deb file name> ... | -R|--recursive ...\n" -" dpkg -A|--record-avail <.deb file name> ... | -R|--recursive ...\n" -" dpkg --configure ... | -a|--pending\n" -" dpkg -r|--remove | -P|--purge ... | -a|--pending\n" -" dpkg --get-selections [ ...] get list of selections to stdout\n" -" dpkg --set-selections set package selections from " -"stdin\n" -" dpkg --update-avail replace available packages info\n" -" dpkg --merge-avail merge with info from file\n" -" dpkg --clear-avail erase existing available info\n" -" dpkg --forget-old-unavail forget uninstalled unavailable " -"pkgs\n" -" dpkg -s|--status ... display package status details\n" -" dpkg -p|--print-avail ... display available version " -"details\n" -" dpkg -L|--listfiles ... list files `owned' by package(s)\n" -" dpkg -l|--list [ ...] list packages concisely\n" -" dpkg -S|--search ... find package(s) owning file(s)\n" -" dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" -" dpkg --compare-versions compare version numbers - see " -"below\n" -" dpkg --help | --version show this help / version number\n" -" dpkg --force-help | -Dh|--debug=help help on forcing resp. debugging\n" -" dpkg --licence print copyright licensing terms\n" -"\n" -"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help.)\n" -"\n" -"For internal use: dpkg --assert-support-predepends | --predep-package |\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n" -"\n" -"Options:\n" -" --admindir= Use instead of %s\n" -" --root= Install on alternative system rooted elsewhere\n" -" --instdir= Change inst'n root without changing admin dir\n" -" -O|--selected-only Skip packages not selected for install/upgrade\n" -" -E|--skip-same-version Skip packages whose same version is installed\n" -" -G|--refuse-downgrade Skip packages with earlier version than " -"installed\n" -" -B|--auto-deconfigure Install even if it would break some other " -"package\n" -" --no-debsig Do no try to verify package signatures\n" -" --no-act|--dry-run|--simulate\n" -" Just say what we would do - don't do it\n" -" -D|--debug= Enable debugging - see -Dhelp or --debug=help\n" -" --status-fd Send status change updates to file descriptor " -"\n" -" --ignore-depends=,... Ignore dependencies involving \n" -" --force-... Override problems - see --force-help\n" -" --no-force-...|--refuse-... Stop when problems encountered\n" -" --abort-after Abort after encountering errors\n" -"\n" -"Comparison operators for --compare-versions are:\n" -" lt le eq ne ge gt (treat empty version as earlier than any version);\n" -" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n" -" < << <= = >= >> > (only for compatibility with control file syntax).\n" -"\n" -"Use `dselect' or 'aptitude' for user-friendly package management.\n" -msgstr "" -"Sintaxă: \n" -" dpkg -i|--install <.deb nume fişier> ... | -R|--recursive ...\n" -" dpkg --unpack <.deb nume fişier> ... | -R|--recursive ...\n" -" dpkg -A|--record-avail <.deb nume fişier> ... | -R|--recursive ...\n" -" dpkg --configure ... | -a|--pending\n" -" dpkg -r|--remove | -P|--purge ... | -a|--pending\n" -" dpkg --get-selections [<şablon> ...] afişează lista selecÅ£iilor la " -"stdout\n" -" dpkg --set-selections activează selecÅ£iile pachetelor " -"de la stdin\n" -" dpkg --update-avail înlocuieşte informaÅ£iile " -"pachetelor disponibile\n" -" dpkg --merge-avail fuzionează cu informaÅ£iile din " -"fişier\n" -" dpkg --clear-avail şterge informaÅ£iile disponibile " -"existente\n" -" dpkg --forget-old-unavail uită de pachetele neinstalate şi " -"indisponibile\n" -" dpkg -s|--status ... afişează detalii despre starea " -"pachetului\n" -" dpkg -p|--print-avail ... afişează detalii despre versiunile " -"disponibile\n" -" dpkg -L|--listfiles ... afişează fişierele aparÅ£inând " -"pachetului(pachetelor)\n" -" dpkg -l|--list [<şablon> ...] afişează concis pachetele\n" -" dpkg -S|--search <şablon> ... caută pachetul(ele) care conÅ£in " -"fişierul(ele)\n" -" dpkg -C|--audit verifică dacă există pachet(e) " -"deteriorate\n" -" dpkg --print-architecture afişează arhitectura sistemului " -"Å£intă (foloseşte GCC)\n" -" dpkg --print-gnu-build-architecture afişează versiunea GNU a " -"arhitecturii sitemului Å£intă\n" -" dpkg --print-installation-architecture afişează arhitectura sistemului " -"gazdă (pentru instalare)\n" -" dpkg --compare-versions compară numerele de versiune - " -"vezi mai jos\n" -" dpkg --help | --version afişează acest ajutor / număr " -"versiune\n" -" dpkg --force-help | -Dh|--debug=help ajutor pentru forÅ£are respectiv " -"depanare\n" -" dpkg --licence afişează termenii de licenÅ£iere " -"şi de copiere\n" -"\n" -"FolosiÅ£i dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile la arhive (tastaÅ£i %s --help.)\n" -"\n" -"Pentru uz intern: dpkg --assert-support-predepends | --predep-package |\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n" -"\n" -"OpÅ£iuni:\n" -" --admindir= Foloseşte în loc de %s\n" -" --root= Instalează pe un sistem alternativ cu rădăcina " -"în \n" -" --instdir= Schimbă directorul de instalare fără schimbarea " -"directorului admin\n" -" -O|--selected-only Sari peste pachetele neselectate pentru " -"instalare/actualizare\n" -" -E|--skip-same-version Sari peste pachetele a căror versiune este " -"instalată\n" -" -G|--refuse-downgrade Sari peste pachetele cu versiune anterioară " -"celor instalate\n" -" -B|--auto-deconfigure Instalează chiar dacă strică alte pachete\n" -" --no-debsig Nu încerca verificarea semnăturii pachetelor\n" -" --no-act|--dry-run|--simulate\n" -" Doar spune ce s-ar face - fără să se facă\n" -" -D|--debug= Activează depanarea - vezi -Dhelp sau --" -"debug=help\n" -" --status-fd Trimite actualizarea legată de schimbarea " -"stării la descriptorul de fişier \n" -" --ignore-depends=,... Ignoră dependenÅ£ele care implică \n" -" --force-... ForÅ£ează rezolvarea problemelor - vezi --" -"force-help\n" -" --no-force-...|--refuse-... Opreşte-te la apariÅ£ia unei probleme\n" -" --abort-after Abandonează după apariÅ£ia a erori\n" -"\n" -"Operatorii de comparare pentru --compare-versions sunt:\n" -" lt le eq ne ge gt (tratează lipsa versiunii ca anterioară oricărei " -"versiuni);\n" -" lt-nl le-nl ge-nl gt-nl (tratează lipsa versiunii ca posterioară oricărei " -"versiuni);\n" -" < << <= = >= >> > (doar pentru compatibilitate cu sintaxa fişierului " -"de control).\n" -"\n" -"Pentru o interfaţă mai prietenoasă folosiÅ£i `dselect' sau 'aptitude'.\n" - -#: main/main.c:120 -msgid "" -"Type dpkg --help for help about installing and deinstalling packages [*];\n" -"Use dselect for user-friendly package management;\n" -"Type dpkg -Dhelp for a list of dpkg debug flag values;\n" -"Type dpkg --force-help for a list of forcing options;\n" -"Type dpkg-deb --help for help about manipulating *.deb files;\n" -"Type dpkg --licence for copyright licence and lack of warranty (GNU GPL) " -"[*].\n" -"\n" -"Options marked [*] produce a lot of output - pipe it through `less' or " -"`more' !" -msgstr "" -"TastaÅ£i dpkg --help pentru ajutor privind instalarea şi dezinstalarea " -"pachetelor [*];\n" -"FolosiÅ£i dselect pentru un management al pachetelor mai prietenos;\n" -"TastaÅ£i dpkg -Dhelp pentru o listă a valorilor fanioanelor de depanare a lui " -"dpkg;\n" -"TastaÅ£i dpkg --force-help pentru o listă a opÅ£iunilor de forÅ£are;\n" -"TastaÅ£i dpkg-deb --help pentru ajutor privind manipularea fişierelor *.deb;\n" -"TastaÅ£i dpkg --licence pentru licenţă şi lipsa de garanÅ£ii (GNU GPL) [*].\n" -"\n" -"OpÅ£iunile marcate cu [*] produc foarte mult text la ieşire - redirectaÅ£i-le " -"prin `less' sau `more' !" - -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 -#, c-format -msgid "conflicting actions --%s and --%s" -msgstr "acÅ£iuni în conflict --%s şi --%s" - -#: main/main.c:190 -#, c-format -msgid "Warning: obsolete option `--%s'\n" -msgstr "Avertisment: opÅ£iune învechită `--%s'\n" - -#: main/main.c:198 -#, c-format -msgid "" -"%s debugging option, --debug= or -D:\n" -"\n" -" number ref. in source description\n" -" 1 general Generally helpful progress information\n" -" 2 scripts Invocation and status of maintainer scripts\n" -" 10 eachfile Output for each file processed\n" -" 100 eachfiledetail Lots of output for each file processed\n" -" 20 conff Output for each configuration file\n" -" 200 conffdetail Lots of output for each configuration file\n" -" 40 depcon Dependencies and conflicts\n" -" 400 depcondetail Lots of dependencies/conflicts output\n" -" 1000 veryverbose Lots of drivel about eg the dpkg/info directory\n" -" 2000 stupidlyverbose Insane amounts of drivel\n" -"\n" -"Debugging options are be mixed using bitwise-or.\n" -"Note that the meanings and values are subject to change.\n" -msgstr "" -"%s opÅ£iuni de depanare, --debug= sau -D:\n" -"\n" -" număr ref. în surse descriere\n" -" 1 general InformaÅ£ii ajutătoare generale despre progres\n" -" 2 scripts Apelul şi starea scripturilor responsabilului " -"pachetului\n" -" 10 eachfile Ieşirea pentru fiecare fişier prelucrat\n" -" 100 eachfiledetail Multe detalii pentru fiecare fişier prelucrat\n" -" 20 conff Ieşirea pentru fiecare fişier de configurare\n" -" 200 conffdetail Multe detalii pentru fiecare fişier de " -"configurare\n" -" 40 depcon DependenÅ£e şi conflicte\n" -" 400 depcondetail Multe detalii despre dependenÅ£e şi conflicte\n" -" 1000 veryverbose Mult mai multe detalii ex. director dpkg/info\n" -" 2000 stupidlyverbose Cantităţi absurde de informaÅ£ii\n" -"\n" -"OpÅ£iunile de depanare pot fi combinate folosind \"sau\" pe biÅ£i.\n" -"A se nota că înÅ£elesul şi valorile se pot schimba.\n" - -#: main/main.c:217 -msgid "--debug requires an octal argument" -msgstr "--debug necesită un argument octal" - -#: main/main.c:241 -#, c-format -msgid "null package name in --ignore-depends comma-separated list `%.250s'" -msgstr "" -"lipsă nume de pachet în lista separată prin virgule `%.250s' de la --ignore-" -"depends" - -#: main/main.c:247 -#, c-format -msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" -msgstr "" -"--ignore-depends necesită un nume valid de pachet. `%.250s' nu este; %s" - -#: main/main.c:263 main/main.c:274 -#, c-format -msgid "invalid integer for --%s: `%.250s'" -msgstr "întreg invalid pentru --%s: `%.250s'" - -#: main/main.c:293 -#, c-format -msgid "" -"%s forcing options - control behaviour when problems found:\n" -" warn but continue: --force-,,...\n" -" stop with error: --refuse-,,... | --no-force-,...\n" -" Forcing things:\n" -" all Set all force options\n" -" auto-select [*] (De)select packages to install (remove) them\n" -" downgrade [*] Replace a package with a lower version\n" -" configure-any Configure any package which may help this one\n" -" hold Process incidental packages even when on hold\n" -" bad-path PATH is missing important programs, problems " -"likely\n" -" not-root Try to (de)install things even when not root\n" -" overwrite Overwrite a file from one package with another\n" -" overwrite-diverted Overwrite a diverted file with an undiverted " -"version\n" -" bad-verify Install a package even if it fails authenticity " -"check\n" -" depends-version [!] Turn dependency version problems into warnings\n" -" depends [!] Turn all dependency problems into warnings\n" -" confnew [!] Always use the new config files, don't prompt\n" -" confold [!] Always use the old config files, don't prompt\n" -" confdef [!] Use the default option for new config files if one\n" -" is available, don't prompt. If no default can be " -"found,\n" -" you will be prompted unless one of the confold or\n" -" confnew options is also given\n" -" confmiss [!] Always install missing config files\n" -" conflicts [!] Allow installation of conflicting packages\n" -" architecture [!] Process even packages with wrong architecture\n" -" overwrite-dir [!] Overwrite one package's directory with another's " -"file\n" -" remove-reinstreq [!] Remove packages which require installation\n" -" remove-essential [!] Remove an essential package\n" -"\n" -"WARNING - use of options marked [!] can seriously damage your installation.\n" -"Forcing options marked [*] are enabled by default.\n" -msgstr "" -"%s opÅ£iuni de forÅ£are - controlează comportamentul în cazul unor probleme:\n" -" avertisment cu continuare: --force-,,...\n" -" eroare cu oprire: --refuse-,,... | --no-force-" -",...\n" -" ForÅ£area acÅ£iunilor:\n" -" all Activează toate opÅ£iunile de forÅ£are\n" -" auto-select [*] (De)selectează pachetele pentru a le instala " -"(îndepărta).\n" -" downgrade [*] Înlocuieşte cu un pachet cu o versiune mai veche\n" -" configure-any Configurează orice pachet care l-ar putea ajuta pe " -"acesta\n" -" hold Procesează pachetele întâlnite chiar şi în situaÅ£ia " -"de păstrare\n" -" bad-path PATH nu acoperă programe importante, probleme " -"similare\n" -" not-root Încearcă să (dez)instaleze chiar fără drepturi de " -"superutillizator\n" -" overwrite Suprascrie un fişier dintr-un pachet cu altul\n" -" overwrite-diverted Suprascrie un fişer redirectat cu o versiune " -"neredirectată\n" -" bad-verify Instalează un pachet chiar dacă eşuează la " -"verificarea autenticităţii\n" -" depends-version [!] Transformă problemele de versiune în avertismente\n" -" depends [!] Transformă toate problemele de dependenÅ£e în " -"avertismente\n" -" confnew [!] Foloseşte mereu fişierele noi de configurare, fără " -"a confirma\n" -" confold [!] Foloseşte mereu fişierele vechi de configurare, " -"fără a confirma\n" -"confdef [!] Foloseşte opÅ£iunea implicită pentru fişierele noi de " -"configurare\n" -" dacă este cazul, nu deranjaÅ£i. Dacă nu-i găsită " -"nici o opÅ£iune implicită,\n" -" veÅ£i fi întrebat doar dacă opÅ£iunea confold sau\n" -" confnew este de asemenea dată\n" -" confmiss [!] Instalează întodeauna fişierele de configurare " -"lipsă\n" -" conflicts [!] Permite instalarea de pachete conflictuale\n" -" architecture [!] Procesează chiar pachete cu arhitectură greşită\n" -" overwrite-dir [!] Rescrie directorul unui pachet cu fişierul altuia\n" -" remove-reinstreq [!] Şterge pachetele ce au nevoie de instalare\n" -" remove-essential [!] Şterge un pachet esenÅ£ial\n" -"\n" -"AVERTISMENT - folosirea opÅ£iunilor marcate cu [!] poate deteriora grav " -"sistemul dvs.\n" -"ForÅ£area opÅ£iunilor marcate cu [*] sunt implicit activate.\n" - -#: main/main.c:338 -#, c-format -msgid "unknown force/refuse option `%.*s'" -msgstr "opÅ£iune de forÅ£are/refuzare necunoscută `%.*s'" - -#: main/main.c:441 main/main.c:445 -msgid "couldn't malloc in execbackend" -msgstr "nu am putut executa malloc în aplicaÅ£ia propriu-zisă" - -#: main/main.c:443 main/main.c:450 -msgid "couldn't strdup in execbackend" -msgstr "nu am putut executa strdup în aplicaÅ£ia propriu-zisă" - -#: main/main.c:454 -#, c-format -msgid "failed to exec %s" -msgstr "eşec la execuÅ£ia %s" - -#: main/main.c:466 -msgid "--command-fd takes 1 argument, not 0" -msgstr "--command-fd ia 1 argument, nu 0" - -#: main/main.c:467 -msgid "--command-fd only takes 1 argument" -msgstr "--command-fd ia doar 1 argument" - -#: main/main.c:469 -msgid "invalid number for --command-fd" -msgstr "număr invalid pentru --command-fd" - -#: main/main.c:471 -#, c-format -msgid "couldn't open `%i' for stream" -msgstr "nu am putut deschide `%i' pentru fluxul de date" - -#: main/main.c:496 -#, c-format -msgid "unexpected eof before end of line %d" -msgstr "sfârşit neaşteptat de fişier înainte de terminarea liniei %d" - -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 -msgid "need an action option" -msgstr "e necesară o opÅ£iune de acÅ£iune" - -#: main/packages.c:79 -#, c-format -msgid "--%s --pending does not take any non-option arguments" -msgstr "--%s --pending nu ia argumente care nu sunt opÅ£iuni" - -#: main/packages.c:109 main/query.c:297 -#, c-format -msgid "--%s needs at least one package name argument" -msgstr "--%s are nevoie cel puÅ£in de un nume de pachet ca argument" - -#: main/packages.c:116 -msgid "" -"you must specify packages by their own names, not by quoting the names of " -"the files they come in" -msgstr "" -"trebuie să specificaÅ£i pachetele prin numele lor, nu prin citarea numelor " -"fişierelor în care acestea vin" - -#: main/packages.c:150 -#, c-format -msgid "Package %s listed more than once, only processing once.\n" -msgstr "" -"Pachetul %s este listat de mai multe ori, va fi procesat doar o dată.\n" - -#: main/packages.c:154 -#, c-format -msgid "" -"More than one copy of package %s has been unpacked\n" -" in this run ! Only configuring it once.\n" -msgstr "" -"Mai multe copii ale pachetului %s au fost despachtate\n" -" în această execuÅ£ie ! Va fi configurat doar o dată.\n" - -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 -msgid " Package " -msgstr " Pachet " - -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 -msgid " which provides " -msgstr " care furnizează " - -#: main/packages.c:273 -msgid " is to be removed.\n" -msgstr " este pe cale de a îndepărtat.\n" - -#: main/packages.c:285 -msgid " Version of " -msgstr " Versiunea lui " - -#: main/packages.c:287 -msgid " on system is " -msgstr " în sistem este " - -#: main/packages.c:307 -#, c-format -msgid "dpkg: also configuring `%s' (required by `%s')\n" -msgstr "dpkg: configurez şi `%s' (cerut de `%s')\n" - -#: main/packages.c:317 -msgid " is not configured yet.\n" -msgstr " nu este configurat încă.\n" - -#: main/packages.c:330 -msgid " is not installed.\n" -msgstr " nu este instalat.\n" - -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 -msgid "; however:\n" -msgstr "; oricum:\n" - -#: main/processarc.c:102 -msgid "cannot access archive" -msgstr "nu pot accesa arhiva" - -#: main/processarc.c:112 -#, c-format -msgid "error ensuring `%.250s' doesn't exist" -msgstr "eroare la asigurarea că `%.250s' nu există" - -#: main/processarc.c:117 -msgid "failed to exec dpkg-split to see if it's part of a multiparter" -msgstr "" -"eşec la execuÅ£ia dpkg-split pentru a vedea dacă este parte dintr-un " -"multivolum" - -#: main/processarc.c:120 -msgid "wait for dpkg-split failed" -msgstr "eşec la aşteptarea lui dpkg-split" - -#: main/processarc.c:126 -msgid "reassembled package file" -msgstr "fişier pachet reasamblat" - -#: main/processarc.c:141 -#, c-format -msgid "Authenticating %s ...\n" -msgstr "Autentific %s ...\n" - -#: main/processarc.c:146 -msgid "failed to execl debsig-verify" -msgstr "eşec la execl în debsig-verify" - -#: main/processarc.c:152 -#, c-format -msgid "Verification on package %s failed!" -msgstr "Verificarea pachetului %s eşuată!" - -#: main/processarc.c:154 -#, c-format -msgid "" -"Verification on package %s failed,\n" -"but installing anyway as you request.\n" -msgstr "" -"Verificarea pachetului %s eşuată,\n" -"dar îl instalez aşa cum aÅ£i cerut.\n" - -#: main/processarc.c:157 -#, c-format -msgid "passed\n" -msgstr "verificat\n" - -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 -msgid "unable to get unique filename for control info" -msgstr "nu pot prelua un nume unic de fişier pentru informaÅ£ia de control" - -#: main/processarc.c:188 -msgid "failed to exec dpkg-deb to extract control information" -msgstr "eşec la execuÅ£ia lui dpkg-deb pentru a extrage informaÅ£ia de control" - -#: main/processarc.c:205 -#, c-format -msgid "Recorded info about %s from %s.\n" -msgstr "Înregistrez informaÅ£ii despre %s de la %s.\n" - -#: main/processarc.c:214 -#, c-format -msgid "package architecture (%s) does not match system (%s)" -msgstr "arhitectura pachetului (%s) nu se potriveşte cu sistemul (%s)" - -#: main/processarc.c:265 -#, c-format -msgid "" -"dpkg: regarding %s containing %s, pre-dependency problem:\n" -"%s" -msgstr "" -"dpkg: legat de %s conÅ£inând %s, probleme de antedependenţă:\n" -"%s" - -#: main/processarc.c:268 -#, c-format -msgid "pre-dependency problem - not installing %.250s" -msgstr "problemă de antedependenţă - nu instalez %.250s" - -#: main/processarc.c:269 -#, c-format -msgid "dpkg: warning - ignoring pre-dependency problem !\n" -msgstr "dpkg: avertisment - ignor problema de antedependenţă !\n" - -#: main/processarc.c:283 -#, c-format -msgid "Preparing to replace %s %s (using %s) ...\n" -msgstr "Mă pregătesc să înlocuiesc %s %s (folosind %s) ...\n" - -#: main/processarc.c:288 -#, c-format -msgid "Unpacking %s (from %s) ...\n" -msgstr "Despachetez %s (din %s) ...\n" - -#: main/processarc.c:308 -#, c-format -msgid "name of conffile (starting `%.250s') is too long (>%d characters)" -msgstr "" -"numele fişierului de configurare (începând `%.250s') este prea lung (>%d " -"caractere)" - -#: main/processarc.c:362 -#, c-format -msgid "read error in %.250s" -msgstr "eroare de citire în %.250s" - -#. conff= fopen() -#: main/processarc.c:364 -#, c-format -msgid "error closing %.250s" -msgstr "eroare la închiderea lui %.250s" - -#: main/processarc.c:366 -#, c-format -msgid "error trying to open %.250s" -msgstr "eroare la încercarea de a deschide %.250s" - -#: main/processarc.c:399 -#, c-format -msgid "De-configuring %s, so that we can remove %s ...\n" -msgstr "Deconfigurăm %s, astfel încit este posibilă îndepărtarea %s ...\n" - -# este vorba despre un nume de pachet( vezi sursa) -#: main/processarc.c:457 -#, c-format -msgid "Unpacking replacement %.250s ...\n" -msgstr "Dezarhivez înlocuitorul %.250s ...\n" - -#: main/processarc.c:536 -msgid "unable to exec dpkg-deb to get filesystem archive" -msgstr "nu pot să execut dpkg-deb pentru a obÅ£ine arhiva sistemului de fişiere" - -#: main/processarc.c:549 -msgid "error reading dpkg-deb tar output" -msgstr "eroare la citirea rezultatului tar al lui dpkg-deb" - -#: main/processarc.c:551 -msgid "corrupted filesystem tarfile - corrupted package archive" -msgstr "" -"sistemul de fişiere al fişierului tar este corupt - arhiva pachetului este " -"coruptă" - -#: main/processarc.c:554 -msgid "dpkg-deb: zap possible trailing zeros" -msgstr "dpkg-deb: şterg posibilele zerouri de la sfârşit" - -#: main/processarc.c:660 -#, c-format -msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" -msgstr "dpkg: avertisment - nu pot şterge fişierul vechi `%.250s': %s\n" - -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 -msgid "cannot read info directory" -msgstr "nu pot citi directorul cu informaÅ£ii" - -#: main/processarc.c:695 -#, c-format -msgid "old version of package has overly-long info file name starting `%.250s'" -msgstr "" -"versiunea veche a pachetului are nume de fişier mult prea lung care începe " -"cu `%.250s'" - -#: main/processarc.c:707 -#, c-format -msgid "unable to remove obsolete info file `%.250s'" -msgstr "nu pot îndepărta fişierul vechi de informaÅ£ii `%.250s'" - -#: main/processarc.c:710 -#, c-format -msgid "unable to install (supposed) new info file `%.250s'" -msgstr "nu pot instala( presupusul) fişier nou de informaÅ£ii `%.250s'" - -#: main/processarc.c:717 -msgid "unable to open temp control directory" -msgstr "nu pot deschide directorul temporar de control" - -#: main/processarc.c:726 -#, c-format -msgid "package contains overly-long control info file name (starting `%.50s')" -msgstr "" -"pachetul conÅ£ine un fişier cu informaÅ£ii de control care are nume mult prea " -"lung (începe cu `%.50s')" - -#: main/processarc.c:731 -#, c-format -msgid "package control info contained directory `%.250s'" -msgstr "informaÅ£iile de control al pachetului conÅ£in directorul `%.250s'" - -# Analiza codului arată că traducerea asta este corectă -#: main/processarc.c:733 -#, c-format -msgid "package control info rmdir of `%.250s' didn't say not a dir" -msgstr "rmdir `%.250s' nu a semnalat că nu este director" - -#: main/processarc.c:739 -#, c-format -msgid "dpkg: warning - package %s contained list as info file" -msgstr "" -"dpkg: avertisment - pachetul %s a conÅ£inut listă ca şi fişier de informaÅ£ii" - -#: main/processarc.c:746 -#, c-format -msgid "unable to install new info file `%.250s' as `%.250s'" -msgstr "nu pot instala noul fişier de informaÅ£ii `%.250s' ca `%.250s'" - -#: main/processarc.c:899 -#, c-format -msgid "(Noting disappearance of %s, which has been completely replaced.)\n" -msgstr "(Notez dispariÅ£ia lui %s, care a fost complet înlocuit.)\n" - -#: main/processarc.c:935 -#, c-format -msgid "unable to delete disappearing control info file `%.250s'" -msgstr "nu pot şterge fişierul cu informaÅ£ii de control dispărut `%.250s'" - -#: main/remove.c:92 -#, c-format -msgid "" -"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n" -msgstr "" -"dpkg - avertisment: ignor cererea de îndepărtare a lui %.250s care nu este " -"instalat.\n" - -#: main/remove.c:100 -#, c-format -msgid "" -"dpkg - warning: ignoring request to remove %.250s, only the config\n" -" files of which are on the system. Use --purge to remove them too.\n" -msgstr "" -"dpkg - avertisment: ignor cererea de îndepărtare a lui %.250s, doar a " -"fişierelor de\n" -" configurare a celor care sunt pe sistem. FolosiÅ£i --purge pentru a le " -"elimina şi pe ele.\n" - -#: main/remove.c:109 -msgid "This is an essential package - it should not be removed." -msgstr "Acest pachet este esenÅ£ial - nu ar trebui îndepărtat." - -#: main/remove.c:135 -#, c-format -msgid "" -"dpkg: dependency problems prevent removal of %s:\n" -"%s" -msgstr "" -"dpkg: problemele de dependenţă preîntâmpină îndepărtarea lui %s:\n" -"%s" - -#: main/remove.c:137 -msgid "dependency problems - not removing" -msgstr "probleme de dependenţă - nu-l elimin" - -#: main/remove.c:141 -#, c-format -msgid "" -"dpkg: %s: dependency problems, but removing anyway as you request:\n" -"%s" -msgstr "" -"dpkg: %s: probleme de dependenţă, dar îl elimin oricum aşa cum aÅ£i cerut:\n" -"%s" - -#: main/remove.c:149 -msgid "" -"Package is in a very bad inconsistent state - you should\n" -" reinstall it before attempting a removal." -msgstr "" -"Pachetul este într-o stare inconsistentă avansată - ar trebui să-l\n" -" reinstalaÅ£i înainte de a încerca să-l îndepărtaÅ£i. " - -#: main/remove.c:156 -#, c-format -msgid "Would remove or purge %s ...\n" -msgstr "Voi îndepărta sau curăţa %s ...\n" - -#: main/remove.c:164 -#, c-format -msgid "Removing %s ...\n" -msgstr "Elimin %s ...\n" - -#: main/remove.c:250 main/remove.c:363 -#, c-format -msgid "" -"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %" -"s - directory may be a mount point ?\n" -msgstr "" -"dpkg - avertisment: în timpul îndepărtării %.250s, nu s-a putut îndepărta " -"directorul `%.250s': %s - poate directorul este punct de montare ?\n" - -#: main/remove.c:257 main/remove.c:370 -#, c-format -msgid "cannot remove `%.250s'" -msgstr "nu pot îndepărta `%.250s'" - -#: main/remove.c:275 -#, c-format -msgid "cannot remove file `%.250s'" -msgstr "nu pot îndepărta fişierul `%.250s'" - -#: main/remove.c:308 -#, c-format -msgid "unable to delete control info file `%.250s'" -msgstr "nu pot să şterg fişierul cu informaÅ£ii de control `%.250s'" - -#: main/remove.c:357 -#, c-format -msgid "" -"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not " -"removed.\n" -msgstr "" -"dpkg - avertisment: la îndepărtarea lui %.250s, directorul `%.250s' nu este " -"gol deci nu este îndepărtat.\n" - -#: main/remove.c:393 -#, c-format -msgid "Purging configuration files for %s ...\n" -msgstr "Curăţ fişierele de configurare pentru %s ...\n" - -#: main/remove.c:437 -#, c-format -msgid "cannot remove old config file `%.250s' (= `%.250s')" -msgstr "nu pot îndepărta vechiul fişier de configurare `%.250s' (= `%.250s')" - -#: main/remove.c:452 -#, c-format -msgid "cannot read config file dir `%.250s' (from `%.250s')" -msgstr "" -"nu pot citi directorul fişierului de configuare `%.250s' (din `%.250s')" - -#: main/remove.c:487 -#, c-format -msgid "cannot remove old backup config file `%.250s' (of `%.250s')" -msgstr "" -"nu pot îndepărta copia de siguranţă a vechiului fişier de configurare `" -"%.250s' (a lui `%.250s')" - -#: main/remove.c:523 -#, c-format -msgid "unable to check existence of `%.250s'" -msgstr "nu pot verifica existenÅ£a lui `%.250s'" - -#: main/remove.c:558 -msgid "cannot remove old files list" -msgstr "nu pot şterge lista fişierelor vechi" - -#: main/remove.c:564 -msgid "can't remove old postrm script" -msgstr "nu se poate înlătura vechiul script postrm" - -#: main/select.c:80 main/query.c:200 main/query.c:422 -#, c-format -msgid "No packages found matching %s.\n" -msgstr "Nu am găsit pachete care să corespundă %s.\n" - -#: main/select.c:95 -msgid "--set-selections does not take any argument" -msgstr "--set-selections nu ia nici un argument" - -#: main/select.c:114 -#, c-format -msgid "unexpected eof in package name at line %d" -msgstr "sfârşit de fişier neaşteptat în numele pachetului la linia %d" - -#: main/select.c:115 -#, c-format -msgid "unexpected end of line in package name at line %d" -msgstr "sfârşit de linie neaşteptat în numele pachetului la linia %d" - -#: main/select.c:119 -#, c-format -msgid "unexpected eof after package name at line %d" -msgstr "sfârşit de fişier neaşteptat după numele pachetului la linia %d" - -#: main/select.c:120 -#, c-format -msgid "unexpected end of line after package name at line %d" -msgstr "sfârşit de linie neaşteptat după numele pachetului la linia %d" - -#: main/select.c:129 -#, c-format -msgid "unexpected data after package and selection at line %d" -msgstr "date neaşteptate după pachet şi selecÅ£ie la linia %d" - -#: main/select.c:134 -#, c-format -msgid "illegal package name at line %d: %.250s" -msgstr "nume invalid de pachet la linia %d: %.250s" - -#: main/select.c:136 -#, c-format -msgid "unknown wanted status at line %d: %.250s" -msgstr "stare cerută necunoscută la lina %d: %.250s" - -#: main/select.c:142 -msgid "read error on standard input" -msgstr "eroare de citire de la intrarea standard" - -#: main/update.c:44 -#, c-format -msgid "--%s takes no arguments" -msgstr "--%s nu ia argumente" - -#: main/update.c:48 -#, c-format -msgid "--%s needs exactly one Packages file argument" -msgstr "--%s are nevoie de exact un fişier pachet ca argument" - -#: main/update.c:57 -msgid "unable to access dpkg status area for bulk available update" -msgstr "" -"incapacitate de acces la zona de stare a lui dpkg pentru actualizarea brută " -"disponibilă" - -#: main/update.c:59 -msgid "bulk available update requires write access to dpkg status area" -msgstr "" -"actualizarea brută disponibilă necesită acces de scriere la zona de stare a " -"lui dpkg" - -#: main/update.c:66 -#, c-format -msgid "Replacing available packages info, using %s.\n" -msgstr "Înlocuiesc informaÅ£iile disponibile despre pachete, folosind %s.\n" - -#: main/update.c:69 -#, c-format -msgid "Updating available packages info, using %s.\n" -msgstr "Actualizez informaÅ£iile disponibile despre pachete, folosind %s.\n" - -#: main/update.c:93 -#, c-format -msgid "Information about %d package(s) was updated.\n" -msgstr "InformaÅ£ile despre %d pachet(e) au fost actualizate.\n" - -#: main/update.c:101 -msgid "--forget-old-unavail takes no arguments" -msgstr "--forget-old-unavail nu ia argumente" - -#: main/query.c:140 -msgid "" -"Desired=Unknown/Install/Remove/Purge/Hold\n" -"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" -"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " -"uppercase=bad)\n" -msgstr "" -"Dorit=Necunoscut/Instalează/Îndepărtează/Şterge/Păstrează\n" -"| Stare=Nu/Instalat/Fişiere-config/Despachetat/Eşec-config/Jumătate-" -"instalat\n" -"|/ Err?=(nimic)/Păstrat/Reinst-necesar/X=ambele-probleme (Stare,Err: " -"majuscule=rău)\n" - -#: main/query.c:144 -msgid "Name" -msgstr "Nume" - -#: main/query.c:144 -msgid "Version" -msgstr "Versiune" - -#: main/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 -msgid "Description" -msgstr "Descriere" - -#: main/query.c:216 -#, c-format -msgid "diversion by %s" -msgstr "redirectare după %s" - -#: main/query.c:217 -#, c-format -msgid "local diversion" -msgstr "redirectare locală" - -#: main/query.c:218 -msgid "to" -msgstr "la" - -#: main/query.c:218 -msgid "from" -msgstr "de la" - -#: main/query.c:251 -msgid "--search needs at least one file name pattern argument" -msgstr "" -"--search are nevoie cel puÅ£in de şablonul numelui de fişier ca argument" - -#: main/query.c:279 -#, c-format -msgid "dpkg: %s not found.\n" -msgstr "dpkg: %s negăsit.\n" - -#: main/query.c:317 -#, c-format -msgid "Package `%s' is not installed and no info is available.\n" -msgstr "" -"Pachetul `%s' nu este instalat şi nu este disponibilă nici o informaÅ£ie.\n" - -#: main/query.c:326 -#, c-format -msgid "Package `%s' is not available.\n" -msgstr "Pachetul `%s' nu este disponibil.\n" - -#: main/query.c:336 -#, c-format -msgid "Package `%s' is not installed.\n" -msgstr "Pachetul `%s' nu este instalat.\n" - -#: main/query.c:345 -#, c-format -msgid "Package `%s' does not contain any files (!)\n" -msgstr "Pachetul `%s' nu conÅ£ine nici un fişier (!)\n" - -#: main/query.c:351 -#, c-format -msgid "locally diverted" -msgstr "redirectat local" - -#: main/query.c:352 -#, c-format -msgid "package diverts others" -msgstr "pachetul redirectează pe alÅ£ii" - -#: main/query.c:353 -#, c-format -msgid "diverted by %s" -msgstr "redirectat de %s" - -#: main/query.c:354 -#, c-format -msgid " to: %s\n" -msgstr " la: %s\n" - -#: main/query.c:373 -msgid "" -"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" -"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" -msgstr "" -"FolosiÅ£i dpkg --info (= dpkg-deb --info) ca să examinaÅ£i fişierele arhivei,\n" -"şi dpkg --contents (= dpkg-deb --contents) ca să-i afişaÅ£i conÅ£inutul.\n" - -#: main/query.c:434 dpkg-deb/main.c:46 -msgid "Debian `" -msgstr "Debian `" - -#: main/query.c:436 -msgid "' package management program query tool\n" -msgstr "' unealtă de interogare a programului de management al pachetelor\n" - -#: main/query.c:448 -#, c-format -msgid "Usage: " -msgstr "Sintaxă: " - -#: main/query.c:449 -#, c-format -msgid "" -" [ ...\n" @@ -2266,11 +2214,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2411,7 +2355,7 @@ msgstr "" "Программы `dselect' или 'aptitude' предоставляют дружественный интерфейс\n" "управления пакетами.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2439,17 +2383,17 @@ msgstr "" "Параметры, отмеченные [*], выводят большое количество информации.\n" "Объедините их в конвейер с программами less или more!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "несовместимые действия --%s и --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Предупреждение: устаревший параметр --%s\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2490,30 +2434,30 @@ msgstr "" "Параметры отладки объединяются побитовой операцией \"или\".\n" "Имейте в виду, что значения и их смысловая нагрузка могут быть изменены.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "параметр --debug принимает в качестве аргумента восьмеричное число" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "пустое имя пакета в разделённом запятыми списке игнорируемых зависимостей " "%.250s" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends требует корректного имени пакета. %.250s таковым не " "является: %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "аргумент --%s (%.250s) не является допустимым целочисленным значением" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2605,62 +2549,62 @@ msgstr "" "повредить\n" "вашу систему. Параметры, отмеченные [*], задействованы по умолчанию.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "недопустимый параметр игнорирования/обработки проблем %.*s" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "не удалось выделить память при работе функции execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "не удалось скопировать строку при работе функции execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "не удалось запустить %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "параметр --command-fd принимает один аргумент, а не ноль" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "параметр --command-fd принимает только один аргумент" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "аргумент параметра --command-fd не является числом" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "не удалось открыть поток дескриптора файла %i" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "неожиданный конец файла, ещё не кончилась строка %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "требуется параметр действия" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending не принимает аргументов, помимо параметров" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s требует указания хотя бы одного имени пакета" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2668,12 +2612,12 @@ msgstr "" "пакеты задаются их собственными именами, а именами файлов, из которых они " "установлены" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Пакет %s перечислен несколько раз, обрабатывается только единожды.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2682,84 +2626,81 @@ msgstr "" "На текущем проходе распаковано несколько копий пакета %s!\n" " Настраивается только одна из них.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Пакет " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " , который предоставляет " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " , должен быть удалён.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Версия пакета " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr ", установленного в системе: " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: настраивается также пакет %s (необходимо для %s)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " ещё не настроен.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " не установлен.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ", однако:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "нет доступа к архиву" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "не удалось убедиться в том, что %.250s не существует" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "не удалось запустить dpkg-split и проверить, является ли файл частью " "многотомного архива" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "ошибка ожидания завершения работы dpkg-split" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "собранный файл пакета" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Проверка подлинности файла %s...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "не удалось запустить debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Пакет %s не проходит проверку подлинности!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2768,31 +2709,30 @@ msgstr "" "Пакет %s не проходит проверку подлинности,\n" "но по вашему указанию всё равно будет установлен.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "пройдена\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "не удалось сгенерировать уникальное имя файла управляющей информации" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "не удалось запустить dpkg-deb, чтобы извлечь управляющую информацию" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Записана информация о пакете %s из файла %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "архитектура пакета (%s) не соответствует архитектуре системы (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2802,147 +2742,339 @@ msgstr "" "$s:\n" "%3$s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "не выполнены предварительные условия, пакет %.250s не будет установлен" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "" "dpkg: предупреждение -- игнорируются предварительные условия установки!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Подготовка к замене пакета %s %s (используется файл %s)...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Распаковывается пакет %s (из файла %s)...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "имя файла конфигурации (начинается с %.250s) слишком длинное (>%d символов)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "ошибка чтения файла %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "ошибка при закрытии файла %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "ошибка при попытке открыть файл %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Удаляются файлы настройки пакета %s, чтобы можно было удалить %s...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Распаковывается замена для пакета %.250s...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "не удалось извлечь архив файловой системы с помощью dpkg-deb" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "ошибка чтения архива tar, возвращённого dpkg-deb" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "повреждённый архив файловой системы: повреждён файл пакета" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: удаление возможных концевых нулей" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: предупреждение -- не удалось удалить старый файл %.250s: %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "ошибка чтения информационного каталога" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "старая версия пакета содержит информационный файл с очень длинным именем, " "начинающимся с %.250s" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "не удалось удалить устаревший информационный файл %.250s" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "не удалось установить новый информационный файл %.250s" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "не удалось открыть временный каталог управляющей информации" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "пакет содержит очень длинное имя файла управляющей информации (начинается с " "%.50s)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "управляющая информация пакета содержит каталог %.250s" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "rmdir при попытке удалить управляющую информацию пакета %.250s не " "утверждает, что это не было каталогом" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "" "dpkg: предупреждение -- пакет %s содержит в качестве информационного файла " "список" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "не удалось переименовать новый информационный файл %.250s в %.250s" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Пакет %s полностью заменён и фактически исчез.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "не удалось удалить файл управляющей информации %.250s" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Желаемый=неизвестно[u]/установить[i]/удалить[r]/вычистить[p]/зафиксировать" +"[h]\n" +"| Состояние=нет[n]/установлен[i]/настроен[c]/распакован[U]/ошибка настройки" +"[F]/\n" +" частично установлен[H]\n" +"|/ Ошибка?=<нет>/зафиксирован[H]/требуется переустановка[R]/X=и то, и " +"другое\n" +"(верхний регистр в полях статуса и ошибки указывает на ненормальную " +"ситуацию)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Имя" + +#: src/query.c:144 +msgid "Version" +msgstr "Версия" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Описание" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Шаблону %s не соответствует ни один пакет.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "размещение файла изменено пакетом %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "локальное изменение размещения файлов" + +#: src/query.c:218 +msgid "to" +msgstr "на" + +#: src/query.c:218 +msgid "from" +msgstr "с" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "" +"--search требует задания в качестве аргумента хотя бы одного шаблона имён " +"файлов" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: файл %s не найден.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Пакет %s не установлен, информация о нём недоступна.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Пакет %s недоступен.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Пакет %s не установлен.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Пакет %s не содержит файлов (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "размещение файла изменено тем же пакетом" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "пакет изменяет размещение файла другого пакета" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "размещение файла изменено пакетом %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " на %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Для проверки файлов архивов используйте команду dpkg --info (dpkg-deb --" +"info),\n" +"для вывода списка файлов в них -- команду dpkg--contents (dpkg-deb --" +"contents).\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr ": обработчик запросов системы управления пакетами\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Вызов: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2211,11 +2159,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2340,7 +2284,7 @@ msgstr "" "Pou¾ite `dselect' alebo 'aptitude' pre u¾ívateµsky prívetivé rozhranie ku " "správe balíkov.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2363,17 +2307,17 @@ msgstr "" "\n" "Voµby oznaèené [*] produkujú rozsiahly výstup - pou¾ite `less' alebo `more' !" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "odporujúce si akcie --%s a --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Upozornenie: zastaralá voµba `--%s'\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2410,27 +2354,27 @@ msgstr "" "Ladiace voµby mô¾u by» mixované pou¾itím bitwise-or.\n" "Poznámka: významy a hodnoty sa mô¾u èasto meni».\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug vy¾aduje osmièkový argument" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "prázdny názov balíku v dvojbodkou oddelenom zozname --ignore-depends `%.250s'" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends vy¾aduje platný názov balíku. `%.250s' nie je; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "neplatné èíslo pre --%s: `%.250s'" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2501,62 +2445,62 @@ msgstr "" "in¹taláciu.\n" "Vnútenie volieb oznaèených [*] je predvolene povelené.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "neznáma vnucovacia/odmietacia voµba `%.*s'" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "nemô¾e vykona» funkciu malloc v execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "nemô¾e vykona» funkciu strdup v execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "nie je mo¾né spusti» %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd vy¾aduje jeden paramater, nie nula" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd vy¾aduje len jeden argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "neplatné èíslo pre --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "nie je mo¾né otvori» `%i' pre tok" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "neèakaný koniec súboru pred koncom riadku %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "potrebujem zada» akciu" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending neuznáva ¾iadne nevoliteµné argumenty" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s vy¾aduje aspoò jeden názov balíku " -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2564,13 +2508,13 @@ msgstr "" "musíte oznaèi» balíky ich vlastnými názvami, nie citovaním názvov súborov z " "ktorých pochádzajú" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "" "Balíèek %s ¹pecifikovaný viac ako jedenkrát, spracovaný len jedenkrát.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2579,84 +2523,81 @@ msgstr "" "Viac ako jedna kópia balíku %s bola rozbalená\n" " v tomto behu ! Konfigurujem len jedenkrát.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Balík " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " ktorý poskytuje " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " bude odstránený.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Verzia " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " v systéme je " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: taktie¾ konfigurujem `%s' (vy¾adované `%s')\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " e¹te nie je nakonfigurovaný.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " nie je nain¹talovaný.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "; aj keï:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "nemô¾e vstúpi» do archívu" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "chyba potvrdzujúca ¾e `%.250s' neexistuje" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "zlyhalo spustenie dpkg-split, aby bolo mo¾né vidie», èi je to èas»ou " "multipartera" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "èakanie na dpkg-split zlyhalo" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "znovuzostavený súbor balíku" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Autentifikujem %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "zlyhalo spustenie funkcie execl na debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verifikácia balíku %s zlyhala!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2665,31 +2606,30 @@ msgstr "" "Verifikácia balíku %s zlyhala,\n" "napriek tomu ju in¹talujem podµa Va¹ej po¾iadavky.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "pre¹iel\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "nie je mo¾né získa» unikátne meno súboru pre riadiace informácie" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "zlyhalo spustenie dpkg-deb na extrakciu riadiacich informácií" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Zaznamenané informácie o %s z %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "architektúra baliku (%s) nezodpovedá systému (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2698,142 +2638,324 @@ msgstr "" "dpkg: problém s pred-závislos»ami v súvislosti s %s, obsahujúcim %s:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "problém s pred-závislos»ami - nein¹talujem %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: upozornenie - ignorujem problém s pred-závislos»ami !\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Pripravujem nahradenie %s %s (pomocou %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Rozbaµujem %s (z %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "názov konfiguraèného súboru (zaèínajúci `%.250s') je príli¹ dlhý (>%d znakov)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "chyba pri èítaní v %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "chyba pri zatváraní %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "chyba pri pokuse otvori» %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Dekonfigurujem %s, aby mohol by» odstránený %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Rozbaµujem náhradu %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "nie je mo¾né spusti» dpkg-deb pre získanie obsahu archívu súborov" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "chyba pri èítaní dpkg-deb tar výstupu" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "po¹kodený systémový tar súbor - po¹kodený archív balíkov" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: zru¹ mo¾né koncové nuly" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: upozornenie - nie je mo¾né vymaza» starý súbor `%.250s': %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "nedá sa preèíta» informácia o adresári" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "stará verzia balíku má príli¹ dlhý názov info súboru, ktorý zaèína `%.250s'" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "nie je mo¾né odstráni» zastaralý info súbor `%.250s'" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "nie je mo¾né nain¹talova» (navrhovaný) nový info súbor `%.250s'" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "nie je mo¾né otvori» doèasný riadiaci adresár" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "balík obsahuje príli¹ dlhý názov riadiaceho info súboru (zaèínajúci `%.50s')" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "riadiaci info balík obsahoval adresár `%.250s'" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "funkcia rmdir u informácií o riadení balíku `%.250s' nepovedala, ¾e to nie " "je adresár" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: upozornenie - balík %s obsahoval zoznam ako info súbor" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "nie je mo¾né nain¹talova» nový info súbor `%.250s' ako `%.250s'" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Zis»ujem zmiznutie balíku %s, ktorý bol úplne nahradený.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "nie je mo¾né zru¹i» zmiznutie riadiaceho info súboru `%.250s'" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Po¾adovaný=Neznámy/In¹talova»/Odstráni»/Vyèisti»\n" +"| Stav=Nie/In¹talovaný/Konfig-súbory/Rozbalený/Zlý-konfig/Polo-in¹talovaný\n" +"|/ Chyba?=(¾iadna)/Podr¾a»/Rein¹t-vy¾adovaná/X=oba-problémy (Stav,Chyba: " +"veµké písmeno=zle)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Názov" + +#: src/query.c:144 +msgid "Version" +msgstr "Verzia" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Popis" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Nena¹iel som ¾iadne balíky vyhovujúce %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "odsunutie balíkom %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokálne odsunutie" + +#: src/query.c:218 +msgid "to" +msgstr "na" + +#: src/query.c:218 +msgid "from" +msgstr "z" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search potrebuje najmenej jeden argument vzorky názvu súboru" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s nebol nájdený.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "" +"Balíèek `%s' nie je nain¹talovaný a nie sú o òom dostupné ¾iadne " +"informácie.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Balíèek `%s' nie je dostupný.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Balíèek `%s' nie je nain¹talovaný.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Balíèek `%s' neobsahuje ¾iadne súbory (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokálne odsunutý" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "balík odsúva ostatné" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "odsunuté %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " na: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Pou¾ite dpkg --info (= dpkg-deb --info) k preskúmaniu archívnych súborov,\n" +"a dpkg --contents (= dpkg-deb --contents) pre vypísanie ich obsahu.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian `" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "' dotazovací nástroj programu na správu balíkov\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Pou¾itie: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2192,11 +2140,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2307,7 +2251,7 @@ msgstr "" "\n" "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2331,17 +2275,17 @@ msgstr "" "Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more" "\"!" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "motstridiga val --%s och --%s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "Varning: föråldrad flagga \"--%s\"\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2378,27 +2322,27 @@ msgstr "" "Felsökningsflaggor kombineras med bitvis eller.\n" "Notera att betydelser och värden kan komma att ändras.\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug behöver ett oktalt argument" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "tomt paketnamn i --ignore-depends kommaseparerade lista \"%.250s\"" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" "--ignore-depends behöver ett giltigt paketnamn. \"%.250s\" är inte det; %s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "ogiltigt heltal för --%s: \"%.250s\"" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2474,62 +2418,62 @@ msgstr "" "installation\n" "om de används. Flaggor markerade [*] är förvalda.\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "okänd flagga för force/refuse: \"%.*s\"" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "kunde inte allokera i execbackend" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "kunde inte duplicera sträng i execbackend" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "kunde inte exekvera %s" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd tar exakt ett argument" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd tar bara ett argument" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "ogiltigt tal för --command-fd" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "kunde inte öppna \"%i\" för ström" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "oväntat filslut före slut på rad %d" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "du har inte talat om vad som skall utföras" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending tar inga argument som inte är flaggor" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s behöver åtminstone ett paket som argument" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" @@ -2537,12 +2481,12 @@ msgstr "" "du måste ange paket med sina egna namn, inte genom att ange namnen på de " "filer de kommer i" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "Paketet %s är listat mer än en gång, hanterar det bara en gång.\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2551,84 +2495,81 @@ msgstr "" "Mer än en kopia av paketet %s har packats upp\n" " under denna körning! Konfigurerar det bara en gång.\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " Paket " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " vilket tillhandahåller " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " är på väg att tas bort.\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " Versionen av " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " på systemet är " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg: konfigurerar även \"%s\" (krävs av \"%s\")\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr " är ännu ej konfigurerat.\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr " är ej installerat.\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr ", men:\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "kan inte komma åt arkivet" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "fel då det skulle säkerställas att \"%.250s\" ej existerar" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "kunde inte exekvera dpkg-split för att se om det är en del av ett flerdelat " "paket" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "kunde inte vänta på dpkg-split" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "återskapade paketfil" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "Autentiserar %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "kunde inte exekvera debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "Verifiering av paket %s misslyckades!" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2637,31 +2578,30 @@ msgstr "" "Verifiering av paket %s misslyckades,\n" "men installerar ändå enligt önskemål.\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "lyckades\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "kunde inte få ett unikt filnamn för kontrollinformationen" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "kunde inte exekvera dpkg-deb för att extrahera kontrollinformationen" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "Lagrade information om %s från %s.\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "paketarkitekturen (%s) matchar inte systemets (%s)" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2670,145 +2610,322 @@ msgstr "" "dpkg: angående %s innehållandes %s, problem med för-beroenden:\n" "%s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "för-beroendeproblem - installerar inte %.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg: varning - ignorerar för-beroendeproblem!\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "Förbereder att ersätta %s %s (med %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "Packar upp %s (från %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "" "namn på konfigurationsfil (som börjar på \"%.250s\") är för lång (>%d tecken)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "läsfel i %.250s" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "fel vid stängning av %.250s" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "fel vid öppning av %.250s" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "Avkonfigurerar %s så att vi kan ta bort %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "Packar upp ersättande %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "kunde inte exekvera dpkg-deb för att få filsystemsarkiv" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "kunde inte läsa dpkg-debs tar-utdata" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "trasig filsystemstarfil - trasigt paketarkiv" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb: dödar möjliga avslutande nollor" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg: varning - kan inte ta bort gammal fil \"%.250s\": %s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "kan inte läsa infokatalog" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "gammal version av paketet har för lång informationsfilnamn som börjar på " "\"%.250s\"" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "kunde inte ta bort gammal informationsfil \"%.250s\"" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "" "kunde inte installera (vad som antas vara) ny informationsfil \"%.250s\"" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "kunde inte öppna temporär kontrollkatalog" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "" "paketet innehåller för långt kontrollinformationsfilnamn (börjar på \"%.50s" "\")" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "paketets kontrollinformation innehåller katalogen \"%.250s\"" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "" "\"rmdir\" på paketets kontrollinformation \"%.250s\" svarade inte \"ej " "katalog\"" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg: varning - paketet %s innehåller list som informationsfil" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "kunde inte installera ny informationsfil \"%.250s\" som \"%.250s\"" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(Noterar att %s försvunnit, vilken helt har ersatts.)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "kunde inte ta bort försvinnande kontrollfil \"%.250s\"" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"Önskat=Okänd(U)/Installera(I)/Radera(R)/Rensa(P)/Håll(H)\n" +"| Status=Ej(N)/Installerad(I)/Konf.(C)/Uppackad(U)/Misslyckad(F)/Delvis(H)\n" +"|/ Fel?Inget(=)/Håll(H)/Ominstallera(R)/Båda(X) (Status,Fel: versaler=illa)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "Namn" + +#: src/query.c:144 +msgid "Version" +msgstr "Version" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "Beskrivning" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "Inga paket matchar %s.\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "omdirigerat av %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "lokal omdirigering" + +#: src/query.c:218 +msgid "to" +msgstr "till" + +#: src/query.c:218 +msgid "from" +msgstr "från" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search behöver åtminstone ett filnamnsmönsterargument" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg: %s kunde ej hittas.\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "Paketet \"%s\" är inte installerat och ingen information finns.\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "Paketet \"%s\" är ej tillgängligt.\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "Paketet \"%s\" är ej installerat.\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "Paketet \"%s\" innehåller inga filer (!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "lokalt omdirigerad" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "paketet omdirigerar andra" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "omdirigerad av %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " till: %s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"Använd dpkg --info (= dpkg-deb --info) för att undersöka arkivfiler,\n" +"och dpkg --contents (= dpkg-deb --contents) för att visa innehållet.\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian \"" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "\" frågeverktyg för pakethanteringsprogrammet\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "Användning: " + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" -" dpkg --unpack <.deb file name> ... | -R|--recursive ...\n" -" dpkg -A|--record-avail <.deb file name> ... | -R|--recursive ...\n" -" dpkg --configure ... | -a|--pending\n" -" dpkg -r|--remove | -P|--purge ... | -a|--pending\n" -" dpkg --get-selections [ ...] get list of selections to stdout\n" -" dpkg --set-selections set package selections from " -"stdin\n" -" dpkg --update-avail replace available packages info\n" -" dpkg --merge-avail merge with info from file\n" -" dpkg --clear-avail erase existing available info\n" -" dpkg --forget-old-unavail forget uninstalled unavailable " -"pkgs\n" -" dpkg -s|--status ... display package status details\n" -" dpkg -p|--print-avail ... display available version " -"details\n" -" dpkg -L|--listfiles ... list files `owned' by package(s)\n" -" dpkg -l|--list [ ...] list packages concisely\n" -" dpkg -S|--search ... find package(s) owning file(s)\n" -" dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" -" dpkg --compare-versions compare version numbers - see " -"below\n" -" dpkg --help | --version show this help / version number\n" -" dpkg --force-help | -Dh|--debug=help help on forcing resp. debugging\n" -" dpkg --licence print copyright licensing terms\n" -"\n" -"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help.)\n" -"\n" -"For internal use: dpkg --assert-support-predepends | --predep-package |\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n" -"\n" -"Options:\n" -" --admindir= Use instead of %s\n" -" --root= Install on alternative system rooted elsewhere\n" -" --instdir= Change inst'n root without changing admin dir\n" -" -O|--selected-only Skip packages not selected for install/upgrade\n" -" -E|--skip-same-version Skip packages whose same version is installed\n" -" -G|--refuse-downgrade Skip packages with earlier version than " -"installed\n" -" -B|--auto-deconfigure Install even if it would break some other " -"package\n" -" --no-debsig Do no try to verify package signatures\n" -" --no-act|--dry-run|--simulate\n" -" Just say what we would do - don't do it\n" -" -D|--debug= Enable debugging - see -Dhelp or --debug=help\n" -" --status-fd Send status change updates to file descriptor " -"\n" -" --ignore-depends=,... Ignore dependencies involving \n" -" --force-... Override problems - see --force-help\n" -" --no-force-...|--refuse-... Stop when problems encountered\n" -" --abort-after Abort after encountering errors\n" -"\n" -"Comparison operators for --compare-versions are:\n" -" lt le eq ne ge gt (treat empty version as earlier than any version);\n" -" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n" -" < << <= = >= >> > (only for compatibility with control file syntax).\n" -"\n" -"Use `dselect' or 'aptitude' for user-friendly package management.\n" -msgstr "" -"Pag-gamit: \n" -" dpkg -i|--install <.deb ngalan ng talaksan> ... |-R|--recursive " -" ...\n" -" dpkg --unpack <.deb ngalan ng talaksan> ... |-R|--recursive " -" ...\n" -" dpkg -A|--record-avail <.deb ngalan ng talaksan> ... |-R|--recursive " -" ...\n" -" dpkg --configure ... | -a|--pending\n" -" dpkg -r|--remove | -P|--purge ... | -a|--pending\n" -" dpkg --get-selections [ ...] ipakita ang listahang pinili sa " -"stdout\n" -" dpkg --set-selections itakda ang piling mga pakete mula sa " -"stdin\n" -" dpkg --update-avail palitan ang info ng magagamit na " -"pkt\n" -" dpkg --merge-avail isama ang info mula sa " -"talaksan\n" -" dpkg --clear-avail burahin ang kasalukuyang info tungkol sa " -"magagamit\n" -" dpkg --forget-old-unavail kalimutan ang tinanggal at di na magamit na " -"pkt\n" -" dpkg -s|--status ... ipakita ang detalye ng kalagayan ng " -"pkt\n" -" dpkg -p|--print-avail ... ipakita ang detalye ng " -"magagamit\n" -" na bersyon\n" -" dpkg -L|--listfiles ... ilista ang mga talaksang\n" -" `pag-aari' ng (mga) pakete\n" -" dpkg -l|--list [ ...] hanapin (mga) pakete na may-" -"ari\n" -" ng (mga) talaksan\n" -" dpkg -C|--audit siyasatin kung may sirang (mga) " -"pakete\n" -" dpkg --print-architecture ipakita ang target na " -"arkitektura\n" -" (gumagamit ng GCC)\n" -" dpkg --print-gnu-build-architecture ipakita ang bersyong GNU ng target " -"arch\n" -" dpkg --print-installation-architecture ipakita ang arkitektura ng " -"host\n" -" (para sa pagluklok)\n" -" dpkg --compare-versions ihambing ang bilang ng " -"bersyon \n" -" - tignan sa ibaba ang \n" -" dpkg --help | --version ipakita itong tulong na ito / bilang ng " -"bersyon\n" -" dpkg --force-help | -Dh|--debug=help tulong tungkol sa pagpilit at sa\n" -" pag-debug\n" -" dpkg --licence ipakita ang karapatang sipi at " -"lisensya\n" -"\n" -"Gamitin ang dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--" -"field|\n" -" -x|--extract|-X|--vextract|--fsys-tarfile sa mga arkibo \n" -" (ipasok %s --help.)\n" -"\n" -"Panloob na gamit lamang: dpkg --assert-support-predepends | --predep-package " -"|\n" -" --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n" -"\n" -"Mga opsyon:\n" -" --admindir= Gamitin ang sa halip ng %s\n" -" --root= Iluklok sa kahaliling sistema na iba ang ugat\n" -" --instdir= Palitan ang ugat ng pagluklok na hindi binabago " -"ang\n" -" admin directory\n" -" -O|--selected-only Laktawan ang mga paketeng di pinili para sa\n" -" pagluklok/pag-apgreyd\n" -" -E|--skip-same-version Laktawan ang mga paketeng kaparehong bersyon sa\n" -" nakaluklok\n" -" -G|--refuse-downgrade Laktawan ang mga paketeng mas-lumang bersyon " -"kaysa\n" -" sa bersyon na nakaluklok\n" -" -B|--auto-deconfigure Iluklok kahit may masisirang ibang pakete\n" -" --no-debsig Huwag subukang tiyakin ang lagda sa mga pakete\n" -" --no-act|--dry-run|--simulate\n" -" Ipakita lamang ang gagawin - huwag gagawin " -"talaga\n" -" -D|--debug= Itakda ang debugging - tignan -Dhelp o --" -"debug=help\n" -" --status-fd Magpadala ng pagbabago ng kalagayan sa file descriptor " -"\n" -" --ignore-depends=,... Huwag pansinin ang dependensiya ng \n" -" --force-... Piliting lampasin ang problema - tignan --force-" -"help\n" -" --no-force-...|--refuse-... Huminto kapag may problema\n" -" --abort-after Huminto matapos magkaroon ng na error\n" -"\n" -"Operator ng paghambing para sa sa --compare-versions ay:\n" -" lt le eq ne ge gt (ibilang na maslumang bersyon ang blankong " -"bersyon)\n" -" lt-nl le-nl ge-nl gt-nl (ibilang na mashuling bersyon ang blankong " -"bersyon)\n" -" < << <= = >= >> > (para lang sa pakikibagay sa syntax ng talaksang " -"control)\n" -"\n" -"Gamitin ang `dselect' o `aptitude' para sa masmadaling tagapangasiwa ng " -"pakete\n" - -#: main/main.c:120 -msgid "" -"Type dpkg --help for help about installing and deinstalling packages [*];\n" -"Use dselect for user-friendly package management;\n" -"Type dpkg -Dhelp for a list of dpkg debug flag values;\n" -"Type dpkg --force-help for a list of forcing options;\n" -"Type dpkg-deb --help for help about manipulating *.deb files;\n" -"Type dpkg --licence for copyright licence and lack of warranty (GNU GPL) " -"[*].\n" -"\n" -"Options marked [*] produce a lot of output - pipe it through `less' or " -"`more' !" -msgstr "" -"dpkg --help para sa tulong tungkol sa pagluklok at pagtanggal ng mga pakete " -"[*];\n" -"Gamitin ang dselect para sa masmadaling tagapangasiwa ng mga pakete;\n" -"dpkg -Dhelp para sa listahan ng mga halaga ng dpkg debug flag;\n" -"dpkg --force-help para sa listahan ng mga opsyon ng pagpilit;\n" -"dpkg-deb --help para sa tulong tungkol sa pag-manipula ng talaksang *.deb;\n" -"dpkg --licence para sa karapatang sipi, lisensiya at kakulangan ng waranti\n" -" (GNU GPL) [*].\n" -"\n" -"Mga opsyon na may markang [*] ay nagpapakita ng maraming output - i-pipe ito " -"sa `less' o `more' !" - -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 -#, c-format -msgid "conflicting actions --%s and --%s" -msgstr "magkatunggaling gagawin --%s at --%s" - -#: main/main.c:190 -#, c-format -msgid "Warning: obsolete option `--%s'\n" -msgstr "Babala: laos na opsyon `--%s'\n" - -#: main/main.c:198 -#, c-format -msgid "" -"%s debugging option, --debug= or -D:\n" -"\n" -" number ref. in source description\n" -" 1 general Generally helpful progress information\n" -" 2 scripts Invocation and status of maintainer scripts\n" -" 10 eachfile Output for each file processed\n" -" 100 eachfiledetail Lots of output for each file processed\n" -" 20 conff Output for each configuration file\n" -" 200 conffdetail Lots of output for each configuration file\n" -" 40 depcon Dependencies and conflicts\n" -" 400 depcondetail Lots of dependencies/conflicts output\n" -" 1000 veryverbose Lots of drivel about eg the dpkg/info directory\n" -" 2000 stupidlyverbose Insane amounts of drivel\n" -"\n" -"Debugging options are be mixed using bitwise-or.\n" -"Note that the meanings and values are subject to change.\n" -msgstr "" -"%s opsyon sa pag-debug, --debug= o -D:\n" -"\n" -" bilang ref. sa bukal paglalarawan\n" -" 1 general Karaniwang nakakatulong na impormasyong progreso\n" -" 2 scripts Pagtawag at kalagayan ng skriptong tagapangalaga\n" -" 10 eachfile Output ng bawat talaksang prinoseso\n" -" 100 eachfiledetail Maraming output ng bawat talaksang prinoseso\n" -" 20 conff Output ng bawat talaksang pagkaayos\n" -" 200 conffdetail Maraming output ng bawat talaksang pagkaayos\n" -" 40 depcon Dependensiya at tunggalian\n" -" 400 depcondetail Maraming output ng dependensiya at tunggalian\n" -" 1000 veryverbose Napakaraming laway hal. ang dpkg/info directory\n" -" 2000 stupidlyverbose Ubod ng daming laway\n" -"\n" -"Opsyon sa pag-debug ay pinagsasama gamit ang bitwise-or.\n" -"Unawain na ang mga kahulugan at halaga ay maaaring magbago.\n" - -#: main/main.c:217 -msgid "--debug requires an octal argument" -msgstr "--debug ay nangangailangan ng argumentong octal" - -#: main/main.c:241 -#, c-format -msgid "null package name in --ignore-depends comma-separated list `%.250s'" -msgstr "" -"ngalan ng pakete na null sa --ignore-depends listahang hiwalay-ng-koma `" -"%.250s'" - -#: main/main.c:247 -#, c-format -msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" -msgstr "" -"--ignore-depends ay nangangailangan ng legal na ngalan ng pakete. `%.250s' " -"ay hindi: %s" - -#: main/main.c:263 main/main.c:274 -#, c-format -msgid "invalid integer for --%s: `%.250s'" -msgstr "di tanggap na integer para sa --%s: `%.250s'" - -#: main/main.c:293 -#, c-format -msgid "" -"%s forcing options - control behaviour when problems found:\n" -" warn but continue: --force-,,...\n" -" stop with error: --refuse-,,... | --no-force-,...\n" -" Forcing things:\n" -" all Set all force options\n" -" auto-select [*] (De)select packages to install (remove) them\n" -" downgrade [*] Replace a package with a lower version\n" -" configure-any Configure any package which may help this one\n" -" hold Process incidental packages even when on hold\n" -" bad-path PATH is missing important programs, problems " -"likely\n" -" not-root Try to (de)install things even when not root\n" -" overwrite Overwrite a file from one package with another\n" -" overwrite-diverted Overwrite a diverted file with an undiverted " -"version\n" -" bad-verify Install a package even if it fails authenticity " -"check\n" -" depends-version [!] Turn dependency version problems into warnings\n" -" depends [!] Turn all dependency problems into warnings\n" -" confnew [!] Always use the new config files, don't prompt\n" -" confold [!] Always use the old config files, don't prompt\n" -" confdef [!] Use the default option for new config files if one\n" -" is available, don't prompt. If no default can be " -"found,\n" -" you will be prompted unless one of the confold or\n" -" confnew options is also given\n" -" confmiss [!] Always install missing config files\n" -" conflicts [!] Allow installation of conflicting packages\n" -" architecture [!] Process even packages with wrong architecture\n" -" overwrite-dir [!] Overwrite one package's directory with another's " -"file\n" -" remove-reinstreq [!] Remove packages which require installation\n" -" remove-essential [!] Remove an essential package\n" -"\n" -"WARNING - use of options marked [!] can seriously damage your installation.\n" -"Forcing options marked [*] are enabled by default.\n" -msgstr "" -"%s opsyon sa pagpilit - ikontrol ang gagawin kapag may problemang nangyari:\n" -" magbabala pero ituloy: --force-,,...\n" -" huminto na may error: --refuse-,,... | --no-force-" -",...\n" -" Pagpilit sa mga bagay:\n" -" all Itakda ang lahat ng opsyong pagpilit\n" -" auto-select [*] (Di) Pagpili ng mga paketeng iluluklok " -"(tatanggalin)\n" -" downgrade [*] Palitan ang pakete ng mas naunang bersyon\n" -" configure-any Isaayos ang alinmang paketeng makakatulong dito\n" -" hold Iproseso ang pakete kahit naka-hold\n" -" bad-path Wala sa PATH ang importanteng mga programa, " -"malamang\n" -" na magkaroon ng mga problema\n" -" not-root Subukang iluklok(tanggalin) ang mga bagay kahit " -"hindi\n" -" root\n" -" overwrite Patungan ang talaksan mula sa isang pakete ng iba\n" -" overwrite-diverted Patungan ang dibertadong talaksan ng di " -"dibertadong \n" -" bersyon\n" -" bad-verify Iluklok ang pakete kahit nabigo ang pagpatibay " -"nito\n" -" depends-version [!] Gawing babala ang mga problema sa dependensiya sa \n" -" bersyon\n" -" depends [!] Gawing babala ang mga problema sa dependensiya\n" -" confnew [!] Gamitin lagi ang bagong talaksang pagkaayos, huwag\n" -" nang magtanong\n" -" confold [!] Gamitin lagi ang lumang talaksang pagkaayos, huwag\n" -" nang magtanong\n" -" confdef [!] Gamitin ang default na opsyon para sa bagong " -"talaksang\n" -" pagkaayos kung mayroon, huwag nang magtanong. Kung\n" -" walang default na magagamit, kayo ay tatanungin\n" -" maliban kung ang confold o confnew na opsyon ay\n" -" ginamit din\n" -" confmis [!] Laging iluklok ang mga kulang na talaksang " -"pagkaayos\n" -" conflicts [!] Payagan ang pagluklok ng magkatunggaling mga " -"pakete\n" -" architecture [!] Iproseso ang pakete kahit maling arkitektura\n" -" overwrite-dir [!] Patungan ang directory ng isang pakete ng talaksan\n" -" ng iba\n" -" remove-reinstreq [!] Tanggalin ang mga paketeng kailangang iluklok\n" -" remove-essential [!] Tanggalin ang esensyal na pakete\n" -"\n" -"BABALA - ang pag-gamit ng mga opsyon na markadong [!] ay maaaring " -"makapinsala\n" -"o makasira ng inyong pagkaluklok. Mga opsyon sa pagpilit na markadong [*] " -"ay\n" -"naka-enable na default.\n" - -#: main/main.c:338 -#, c-format -msgid "unknown force/refuse option `%.*s'" -msgstr "di kilalang opsyon na force/refuse `%.*s'" - -#: main/main.c:441 main/main.c:445 -msgid "couldn't malloc in execbackend" -msgstr "hindi maka-malloc sa execbackend" - -#: main/main.c:443 main/main.c:450 -msgid "couldn't strdup in execbackend" -msgstr "hindi maka-strdup sa execbackend" - -#: main/main.c:454 -#, c-format -msgid "failed to exec %s" -msgstr "bigo sa pag-exec ng %s" - -#: main/main.c:466 -msgid "--command-fd takes 1 argument, not 0" -msgstr "--command-fd ay tumatanggap ng 1 argumento, hindi 0" - -#: main/main.c:467 -msgid "--command-fd only takes 1 argument" -msgstr "--command-fd ay tumatanggap lamang ng 1 argumento" - -#: main/main.c:469 -msgid "invalid number for --command-fd" -msgstr "di tanggap na numero para sa --command-fd" - -#: main/main.c:471 -#, c-format -msgid "couldn't open `%i' for stream" -msgstr "hindi mabuksan ang `%i' para sa stream" - -#: main/main.c:496 -#, c-format -msgid "unexpected eof before end of line %d" -msgstr "di inaasahang eof bago matapos ang linya %d" - -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 -msgid "need an action option" -msgstr "kailangan ng opsyon ng gagawin" - -#: main/packages.c:79 -#, c-format -msgid "--%s --pending does not take any non-option arguments" -msgstr "--%s --pending ay hindi tumatanggap ng argumentong hindi opsyon" - -#: main/packages.c:109 main/query.c:297 -#, c-format -msgid "--%s needs at least one package name argument" -msgstr "" -"--%s ay nangangailangan ng di kukulang sa isa na argumentong ngalan ng pakete" - -#: main/packages.c:116 -msgid "" -"you must specify packages by their own names, not by quoting the names of " -"the files they come in" -msgstr "" -"kailangan niyong itakda ang mga pakete sa kanilang mga pangalan, hindi ang " -"pangalan ng talaksan na kinaroroonan nila" - -#: main/packages.c:150 -#, c-format -msgid "Package %s listed more than once, only processing once.\n" -msgstr "" -"Nakalista ang paketeng %s ng higit sa isang beses, pinoproseso ng isang\n" -"beses lamang.\n" - -#: main/packages.c:154 -#, c-format -msgid "" -"More than one copy of package %s has been unpacked\n" -" in this run ! Only configuring it once.\n" -msgstr "" -"Higit sa isang kopya ng paketeng %s ay nabuklat sa pagtakbong ito !\n" -"Isasaayos ito ng isang beses lamang.\n" - -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 -msgid " Package " -msgstr " Pakete " - -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 -msgid " which provides " -msgstr " na nagbibigay " - -#: main/packages.c:273 -msgid " is to be removed.\n" -msgstr " ay tatanggalin.\n" - -#: main/packages.c:285 -msgid " Version of " -msgstr " Bersyon ng " - -#: main/packages.c:287 -msgid " on system is " -msgstr " sa sistema ay " - -#: main/packages.c:307 -#, c-format -msgid "dpkg: also configuring `%s' (required by `%s')\n" -msgstr "dpkg: isinasaayos din ang `%s' (kailangan ng `%s')\n" - -#: main/packages.c:317 -msgid " is not configured yet.\n" -msgstr " ay hindi pa nakaayos.\n" - -#: main/packages.c:330 -msgid " is not installed.\n" -msgstr " ay hindi nakaluklok.\n" - -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 -msgid "; however:\n" -msgstr "; gayunpaman:\n" - -#: main/processarc.c:102 -msgid "cannot access archive" -msgstr "hindi ma-akses ang arkibo" - -#: main/processarc.c:112 -#, c-format -msgid "error ensuring `%.250s' doesn't exist" -msgstr "error sa paniguradong `%.250s' ay wala" - -#: main/processarc.c:117 -msgid "failed to exec dpkg-split to see if it's part of a multiparter" -msgstr "" -"bigo sa pag-exec ng dpkg-split upang makita kung ito'y bahagi na multiparter" - -#: main/processarc.c:120 -msgid "wait for dpkg-split failed" -msgstr "bigo ang paghintay sa dpkg-split" - -#: main/processarc.c:126 -msgid "reassembled package file" -msgstr "binuo muli ang talaksang pakete" - -#: main/processarc.c:141 -#, c-format -msgid "Authenticating %s ...\n" -msgstr "Tinitiyak ang %s ...\n" - -#: main/processarc.c:146 -msgid "failed to execl debsig-verify" -msgstr "bigo na i-execl ang debsig-verify" - -#: main/processarc.c:152 -#, c-format -msgid "Verification on package %s failed!" -msgstr "Bigo ang pagtiyak sa paketeng %s!" - -#: main/processarc.c:154 -#, c-format -msgid "" -"Verification on package %s failed,\n" -"but installing anyway as you request.\n" -msgstr "" -"Bigo ang pagtiyak sa paketeng %s,\n" -"ngunit iluluklok pa rin tulad ng inyong hiling.\n" - -#: main/processarc.c:157 -#, c-format -msgid "passed\n" -msgstr "pasado\n" - -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 -msgid "unable to get unique filename for control info" -msgstr "hindi makakuha ng kakaibang ngalang talaksan para sa control info" - -#: main/processarc.c:188 -msgid "failed to exec dpkg-deb to extract control information" -msgstr "bigo sa pag-exec ng dpkg-deb upang ma-extract ang impormasyong control" - -#: main/processarc.c:205 -#, c-format -msgid "Recorded info about %s from %s.\n" -msgstr "Tinala ang info tungkol sa %s mula sa %s.\n" - -#: main/processarc.c:214 -#, c-format -msgid "package architecture (%s) does not match system (%s)" -msgstr "arkitektura ng pakete (%s) ay hindi lapat sa sistema (%s)" - -#: main/processarc.c:265 -#, c-format -msgid "" -"dpkg: regarding %s containing %s, pre-dependency problem:\n" -"%s" -msgstr "" -"dpkg: tungkol sa %s na naglalaman ng %s, problemang pre-dependensiya:\n" -"%s" - -#: main/processarc.c:268 -#, c-format -msgid "pre-dependency problem - not installing %.250s" -msgstr "problemang pre-dependensiya - hindi iluluklok ang %.250s" - -#: main/processarc.c:269 -#, c-format -msgid "dpkg: warning - ignoring pre-dependency problem !\n" -msgstr "dpkg: babala - di pinansin ang problemang pre-dependensiya !\n" - -#: main/processarc.c:283 -#, c-format -msgid "Preparing to replace %s %s (using %s) ...\n" -msgstr "Naghahandang palitan ang %s %s (gamit ang %s) ...\n" - -#: main/processarc.c:288 -#, c-format -msgid "Unpacking %s (from %s) ...\n" -msgstr "Binubuklat ang %s (mula sa %s) ...\n" - -#: main/processarc.c:308 -#, c-format -msgid "name of conffile (starting `%.250s') is too long (>%d characters)" -msgstr "" -"pangalan ng conffile (nagumpisa `%.250s') ay labis ang haba (>%d karakter)" - -#: main/processarc.c:362 -#, c-format -msgid "read error in %.250s" -msgstr "error sa pagbasa sa %.250s" - -#. conff= fopen() -#: main/processarc.c:364 -#, c-format -msgid "error closing %.250s" -msgstr "error sa pagsara %.250s" - -#: main/processarc.c:366 -#, c-format -msgid "error trying to open %.250s" -msgstr "error habang sinubukang buksan ang %.250s" - -#: main/processarc.c:399 -#, c-format -msgid "De-configuring %s, so that we can remove %s ...\n" -msgstr "" -"Tinatanggalan ng pagkaayos ang %s, upang maaaring tanggalin ang %s ...\n" - -#: main/processarc.c:457 -#, c-format -msgid "Unpacking replacement %.250s ...\n" -msgstr "Binubuklat ang papalit sa %.250s ...\n" - -#: main/processarc.c:536 -msgid "unable to exec dpkg-deb to get filesystem archive" -msgstr "hindi ma-exec ang dpkg-deb upang kunin ang arkibo ng filesystem" - -#: main/processarc.c:549 -msgid "error reading dpkg-deb tar output" -msgstr "error sa pagbasa ng dpkg-deb tar output" - -#: main/processarc.c:551 -msgid "corrupted filesystem tarfile - corrupted package archive" -msgstr "sirang filesystem tarfile - sira ang arkibong pakete" - -#: main/processarc.c:554 -msgid "dpkg-deb: zap possible trailing zeros" -msgstr "dpkg-deb: i-zap ang posibleng susunod na mga sero" - -#: main/processarc.c:660 -#, c-format -msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" -msgstr "dpkg: babala - hindi matanggal ang lumang talaksan `%.250s': %s\n" - -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 -msgid "cannot read info directory" -msgstr "hindi mabasa ang info directory" - -#: main/processarc.c:695 -#, c-format -msgid "old version of package has overly-long info file name starting `%.250s'" -msgstr "" -"lumang bersyon ng pakete ay may sobrang-haba na ngalan ng talaksang info \n" -"nagsisimula `%.250s'" - -#: main/processarc.c:707 -#, c-format -msgid "unable to remove obsolete info file `%.250s'" -msgstr "hindi matanggal ang laos na talaksang info `%.250s'" - -#: main/processarc.c:710 -#, c-format -msgid "unable to install (supposed) new info file `%.250s'" -msgstr "hindi maluklok (daw) bagong talaksang info `%.250s'" - -#: main/processarc.c:717 -msgid "unable to open temp control directory" -msgstr "hindi mabuksan ang temp control directory" - -#: main/processarc.c:726 -#, c-format -msgid "package contains overly-long control info file name (starting `%.50s')" -msgstr "" -"naglalaman ang pakete ng sobrang-haba na ngalan ng talaksang control info\n" -"(nagsisimula `%.50s')" - -#: main/processarc.c:731 -#, c-format -msgid "package control info contained directory `%.250s'" -msgstr "control info ng pakete ay naglaman ng directory `%.250s'" - -#: main/processarc.c:733 -#, c-format -msgid "package control info rmdir of `%.250s' didn't say not a dir" -msgstr "control info ng pakete rmdir ng `%.250s' hindi nagsabing hindi ito dir" - -#: main/processarc.c:739 -#, c-format -msgid "dpkg: warning - package %s contained list as info file" -msgstr "" -"dpkg: babala - ang paketeng %s ay naglaman ng listahan bilang talaksang info" - -#: main/processarc.c:746 -#, c-format -msgid "unable to install new info file `%.250s' as `%.250s'" -msgstr "hindi mailuklok ang bagong talaksang info `%.250s' bilang `%.250s'" - -#: main/processarc.c:899 -#, c-format -msgid "(Noting disappearance of %s, which has been completely replaced.)\n" -msgstr "(Pinupuna ang pagkawala ng %s, na siyang napalitan ng buo.)\n" - -#: main/processarc.c:935 -#, c-format -msgid "unable to delete disappearing control info file `%.250s'" -msgstr "hindi matanggal ang nawawalang talaksang control info `%.250s'" - -#: main/remove.c:92 -#, c-format -msgid "" -"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n" -msgstr "" -"dpkg - babala: hindi pinapansin ang hiling na tanggalin ang %.250s na hindi\n" -" naman nakaluklok.\n" - -#: main/remove.c:100 -#, c-format -msgid "" -"dpkg - warning: ignoring request to remove %.250s, only the config\n" -" files of which are on the system. Use --purge to remove them too.\n" -msgstr "" -"dpkg - babala: hindi pinapansin ang hiling na tanggalin ang %.250s, na ang\n" -" talaksang pagkaayos nito lamang ang nasa sistema. Gamitin ang --purge " -"upang\n" -" matanggal din ang mga ito.\n" - -#: main/remove.c:109 -msgid "This is an essential package - it should not be removed." -msgstr "Ito ay esensiyal na pakete - hindi dapat tanggalin." - -#: main/remove.c:135 -#, c-format -msgid "" -"dpkg: dependency problems prevent removal of %s:\n" -"%s" -msgstr "" -"dpkg: problema sa dependensiya ang hadlang sa pagtanggal ng %s:\n" -"%s" - -#: main/remove.c:137 -msgid "dependency problems - not removing" -msgstr "problema sa dependensiya - hindi tatanggalin" - -#: main/remove.c:141 -#, c-format -msgid "" -"dpkg: %s: dependency problems, but removing anyway as you request:\n" -"%s" -msgstr "" -"dpkg: %s: problema sa dependensiya, pero tatanggalin din dahil inyong " -"hiniling:\n" -"%s" - -#: main/remove.c:149 -msgid "" -"Package is in a very bad inconsistent state - you should\n" -" reinstall it before attempting a removal." -msgstr "" -"Pakete ay nasa masama at di maasahang kalagayan - kailangan niyong iluklok " -"ito\n" -" muli bago niyo subukang tanggalin." - -#: main/remove.c:156 -#, c-format -msgid "Would remove or purge %s ...\n" -msgstr "Tatanggalin o pupurgahin ang %s ...\n" - -#: main/remove.c:164 -#, c-format -msgid "Removing %s ...\n" -msgstr "Tinatanggal ang %s ...\n" - -#: main/remove.c:250 main/remove.c:363 -#, c-format -msgid "" -"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %" -"s - directory may be a mount point ?\n" -msgstr "" -"dpkg - babala: habang tinatanggal ang %.250s, hindi matanggal ang directory\n" -" `%.250s': %s - directory ay maaaring punto ng paglapat ?\n" - -#: main/remove.c:257 main/remove.c:370 -#, c-format -msgid "cannot remove `%.250s'" -msgstr "hindi matanggal ang `%.250s'" - -#: main/remove.c:275 -#, c-format -msgid "cannot remove file `%.250s'" -msgstr "hindi matanggal ang talaksang `%.250s'" - -#: main/remove.c:308 -#, c-format -msgid "unable to delete control info file `%.250s'" -msgstr "hindi matanggal ang talaksang control info `%.250s'" - -#: main/remove.c:357 -#, c-format -msgid "" -"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not " -"removed.\n" -msgstr "" -"dpkg - babala: habang tinatanggal ang %.250s, may laman ang directory `" -"%.250s'\n" -" kaya't hindi ito tinanggal.\n" - -#: main/remove.c:393 -#, c-format -msgid "Purging configuration files for %s ...\n" -msgstr "Pinupurga ang talaksang pagkaayos ng %s ...\n" - -#: main/remove.c:437 -#, c-format -msgid "cannot remove old config file `%.250s' (= `%.250s')" -msgstr "hindi matanggal ang lumang talaksang pagkaayos `%.250s' (= `%.250s')" - -#: main/remove.c:452 -#, c-format -msgid "cannot read config file dir `%.250s' (from `%.250s')" -msgstr "hindi mabasa ang dir ng talaksang pagkaayos `%.250s' (mula `%.250s')" - -#: main/remove.c:487 -#, c-format -msgid "cannot remove old backup config file `%.250s' (of `%.250s')" -msgstr "" -"hindi matanggal ang lumang backup ng talaksang pagkaayos `%.250s' (ng `" -"%.250s')" - -#: main/remove.c:523 -#, c-format -msgid "unable to check existence of `%.250s'" -msgstr "hindi matiyak ang pagkakaroon ng `%.250s'" - -#: main/remove.c:558 -msgid "cannot remove old files list" -msgstr "hindi matanggal ang lumang listahan ng talaksan" - -#: main/remove.c:564 -msgid "can't remove old postrm script" -msgstr "hindi matanggal ang lumang skriptong postrm" - -#: main/select.c:80 main/query.c:200 main/query.c:422 -#, c-format -msgid "No packages found matching %s.\n" -msgstr "Walang paketeng tugma sa %s.\n" - -#: main/select.c:95 -msgid "--set-selections does not take any argument" -msgstr "--set-selections ay hindi tumatanggap ng argumento" - -#: main/select.c:114 -#, c-format -msgid "unexpected eof in package name at line %d" -msgstr "di inaasahang eof sa pangalan ng pakete sa linya %d" - -#: main/select.c:115 -#, c-format -msgid "unexpected end of line in package name at line %d" -msgstr "di inaasahang dulo ng linya sa pangalan ng pakete sa linya %d" - -#: main/select.c:119 -#, c-format -msgid "unexpected eof after package name at line %d" -msgstr "di inaasahang eof matapos ng pangalan ng pakete sa linya %d" - -#: main/select.c:120 -#, c-format -msgid "unexpected end of line after package name at line %d" -msgstr "di inaasahang dulo ng linya matapos ng pangalan ng pakete sa linya %d" - -#: main/select.c:129 -#, c-format -msgid "unexpected data after package and selection at line %d" -msgstr "di inaasahang datos matapos ng pakete at pinili sa linya %d" - -#: main/select.c:134 -#, c-format -msgid "illegal package name at line %d: %.250s" -msgstr "bawal na pangalan ng pakete sa linya %d: %.250s" - -#: main/select.c:136 -#, c-format -msgid "unknown wanted status at line %d: %.250s" -msgstr "di kilalang kalagayan sa linya %d: %.250s" - -#: main/select.c:142 -msgid "read error on standard input" -msgstr "error sa pagbasa ng standard input" - -#: main/update.c:44 -#, c-format -msgid "--%s takes no arguments" -msgstr "--%s ay hindi tumatanggap ng mga argumento" - -#: main/update.c:48 -#, c-format -msgid "--%s needs exactly one Packages file argument" -msgstr "--%s ay nangangailangan ng isang argumentong talaksang Packages" - -#: main/update.c:57 -msgid "unable to access dpkg status area for bulk available update" -msgstr "" -"di ma-akses ang dpkg status area para sa maramihang pag-apdeyt ng magagamit" - -#: main/update.c:59 -msgid "bulk available update requires write access to dpkg status area" -msgstr "" -"kailangan ng akses sa pagsulat sa dpkg status area ng maramihang pag-apdeyt " -"ng\n" -"magagamit" - -#: main/update.c:66 -#, c-format -msgid "Replacing available packages info, using %s.\n" -msgstr "" -"Pinapalitan ang info tungkol sa magagamit na mga pakete, gamit ang %s.\n" - -#: main/update.c:69 -#, c-format -msgid "Updating available packages info, using %s.\n" -msgstr "" -"Ina-apdeyt ang info tungkol sa magagamit na mga pakete, gamit ang %s.\n" - -#: main/update.c:93 -#, c-format -msgid "Information about %d package(s) was updated.\n" -msgstr "Impormasyon tungkol sa %d na (mga) pakete ay inapdeyt.\n" - -#: main/update.c:101 -msgid "--forget-old-unavail takes no arguments" -msgstr "--forget-old-unavail ay hindi tumatanggap ng argumento" - -#: main/query.c:140 -msgid "" -"Desired=Unknown/Install/Remove/Purge/Hold\n" -"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" -"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " -"uppercase=bad)\n" -msgstr "" -"Hiling=U-Di alam/Iluklok/R-Tanggalin/Purgahin/Hold\n" -"| Kalagayan=Not/Installed/Config-files/Unpacked/Failed-config/Half-" -"installed\n" -"|/ Err?=(wala)/Hold/Reinst-required/X=parehong-problema \n" -"| (Status, Err: masama kapag malaking letra)\n" - -#: main/query.c:144 -msgid "Name" -msgstr "Pangalan" - -#: main/query.c:144 -msgid "Version" -msgstr "Bersyon" - -#: main/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 -msgid "Description" -msgstr "Paglalarawan" - -#: main/query.c:216 -#, c-format -msgid "diversion by %s" -msgstr "dibersyon ng %s" - -#: main/query.c:217 -#, c-format -msgid "local diversion" -msgstr "lokal na dibersyon" - -#: main/query.c:218 -msgid "to" -msgstr "tungo" - -#: main/query.c:218 -msgid "from" -msgstr "mula" - -#: main/query.c:251 -msgid "--search needs at least one file name pattern argument" -msgstr "" -"--search ay nangangailangan ng di kukulang sa isang argumentong pattern ng\n" -" pangalan ng talaksan" - -#: main/query.c:279 -#, c-format -msgid "dpkg: %s not found.\n" -msgstr "dpkg: di nahanap ang %s.\n" - -#: main/query.c:317 -#, c-format -msgid "Package `%s' is not installed and no info is available.\n" -msgstr "Di nakaluklok ang paketeng `%s' at walang info tungkol dito.\n" - -#: main/query.c:326 -#, c-format -msgid "Package `%s' is not available.\n" -msgstr "Di magagamit ang paketeng `%s'.\n" - -#: main/query.c:336 -#, c-format -msgid "Package `%s' is not installed.\n" -msgstr "Di nakaluklok ang paketeng `%s'.\n" - -#: main/query.c:345 -#, c-format -msgid "Package `%s' does not contain any files (!)\n" -msgstr "Walang laman ang paketeng `%s' (!)\n" - -#: main/query.c:351 -#, c-format -msgid "locally diverted" -msgstr "dibertado na lokal" - -#: main/query.c:352 -#, c-format -msgid "package diverts others" -msgstr "ang pakete ay nanghahalili sa iba" - -#: main/query.c:353 -#, c-format -msgid "diverted by %s" -msgstr "dibertado ng %s" - -#: main/query.c:354 -#, c-format -msgid " to: %s\n" -msgstr " patungo: %s\n" - -#: main/query.c:373 -msgid "" -"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" -"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" -msgstr "" -"Gamitin dpkg --info (= dpkg-deb --info) upang tignan ang talksang arkibo,\n" -"at dpkg --contents (= dpkg-deb --contents) upang ilista ang nilalaman nila.\n" - -#: main/query.c:434 dpkg-deb/main.c:46 -msgid "Debian `" -msgstr "Debian `" - -#: main/query.c:436 -msgid "' package management program query tool\n" -msgstr " kasangkapan sa pagtanong ng programang tagapangasiwa ng mga pakete\n" - -#: main/query.c:448 -#, c-format -msgid "Usage: " -msgstr "Pag-gamit: " - -#: main/query.c:449 -#, c-format -msgid "" -" [ ...\n" @@ -2157,11 +2105,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2270,7 +2214,7 @@ msgstr "" "\n" "“dselect”提供了更为易用的的软件包管理工具。\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2292,17 +2236,17 @@ msgstr "" "带有[*]的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接" "到“less”或“more”！" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "操作之间有矛盾 -- %s 和 -- %s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "警告：已废弃不用的选项“--%s”\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2339,27 +2283,27 @@ msgstr "" "可以用位与(bitwise-or)把除错选项组合起来使用。\n" "注意，意义和数值将有可能更动。\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug 需要一个八进制的参数" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" "在 --ignore-depends 的用逗号相隔的参数列表“%s”中，发现有的软件包名是空的" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends 需要一个有效的软件包名。而“%.250s”却不是；%s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "--%s 有一个无效的数字参数：“%.250s”" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2433,74 +2377,74 @@ msgstr "" "警告 - 使用带有[!]标记的选项可能会严重破坏您的系统安装。\n" "缺省情况下，是使用带有[*]标记的强制手段的。\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "无法识别的 force/refuse 选项“%.*s”" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "无法在 execbackend 中 malloc" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "无法在 execbackend 中 strdup" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "exec %s 失败" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd 需要带一个参数，而不是零个" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd 只需带一个参数" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "--command-fd 有一个无效的数字参数" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "无法打开“%i”，并把它作为字符流操作" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "在第 %d 行还未结束时，发现了预料之外的 eof" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "需要一个指示操作的选项" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending 不需任何不是选项的参数" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s 需要至少一个软件包名作为参数" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "" "您必须通过软件包自身的名字来指定软件包，而不是直接引用软件包文件的文件名" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "多次列出了软件包 %s，它将只被处理一次。\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2509,84 +2453,81 @@ msgstr "" "在这此运行中，软件包 %s 有多个副本被解压缩了！\n" "现只配置它一次。\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " 软件包 " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " 提供了 " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " 即将被删除。\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " 系统里的 " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " 的版本是 " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg：同时也对“%s”进行配置(“%s”需要如此)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr "还没有被配置。\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr "还没有被安装。\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "；然而：\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "无法访问打包文件" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "在确保文件“%.250s”不存在时出错" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "exec dpkg-split 时出错，该操作被用来判断这是否是一个套件(multiparter)中的一个" "组成部分" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "等待 dpkg-split 子进程失败" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "重新组装成的软件包文件" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "正在验证 %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "无法 execl debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "软件包 %s 没有通过验证！" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2595,31 +2536,30 @@ msgstr "" "虽然软件包 %s 没能通过验证，\n" "但还是如您所愿继续安装它。\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "验证通过\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "控制信息无法得到唯一的文件名" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "无法 exec dpkg-deb，通过它来解压缩控制信息" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "从 %2$s 获得的关于 %1$s 的信息。\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "软件包的体系架构(%s)与本机系统的架构(%s)不符" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2628,143 +2568,322 @@ msgstr "" "dpkg：对于含 %2$s 的文件 %1$s 来说，有预依赖(pre-dependency)方面的问题：\n" "%3$s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "预依赖(pre-dependency)问题 - 将不安装%.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg：警告 - 忽视了预依赖(pre-dependency)问题！\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "正预备替换 %s %s (使用 %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "正在解压缩 %s (从 %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "conffile 的文件名(其开头是“%.250s”)过长(> %d 个字符)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "在 %.250s 中发生读错误" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "在关闭 %.250s 时发生错误" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "当试图打开 %.250s 时发生错误" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "正在抹去 %s 的设置信息，只有这样我们才能删除 %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "正在解压缩将用于更替的包文件 %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "无法 exec dpkg-deb，以此来获得打包后的文件系统" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "无法读取 dpkg-deb 输出的 tar 文件" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb：截去了最后的零数据(zeros)" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg：警告 - 无法删除原有的文件“%.250s”：%s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "无法读取信息(info)目录" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "原先版本的软件包中有一个信息文件的文件名过长，文件名是以“%.250s”开头的" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "无法删除废弃不用的信息文件“%.250s”" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "无法安装文件“%.250s”，该文件被认定是新的信息文件" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "无法打开临时主控目录" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "软件包中有一个主控信息文件的文件名过长(该文件名是以“%.250s”开头的)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "软件包的主控信息含有一个目录“%.250s”" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "软件包控制信息，rmdir “%.250s”也没有说这不是一个目录" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg：警告 - 软件包 %s 把一个列表作为信息文件使用" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "无法把新的信息文件“%.250s”安装到“%.250s”" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(注意到 %s 已经不复存在，它已然被完全取代了。)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "无法删除已经消失了的控制信息文件“%.250s”" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"期望状态=未知(u)/安装(i)/删除(r)/清除(p)/保持(h)\n" +"| 当前状态=未(n)/已安装(i)/仅存配置(c)/仅解压缩(U)/配置失败(F)/不完全安装" +"(H)\n" +"|/ 错误？=(无)/保持(?)/须重装(R)/两者兼有(#) (状态，错误：大写=故障)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "名称" + +#: src/query.c:144 +msgid "Version" +msgstr "版本" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "简介" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "没有找到与 %s 相匹配的软件包。\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "转移(diversion)到了 %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "本地转移项(local diversion)" + +#: src/query.c:218 +msgid "to" +msgstr "到" + +#: src/query.c:218 +msgid "from" +msgstr "从" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search 需要至少一个文件名表达式作为参数" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg：没有找到 %s。\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "系统没有安装软件包“%s”，因而没有相关的信息。\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "软件包“%s”现在不可用。\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "未曾安装软件包“%s”。\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "软件包“%s”未含有任何文件(!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "本地转移(locally diverted)" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "软件包是其他软件包的转移项" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "转移到了(diverted by) %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " 转移文件现指向：%s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n" +"还可以用过 dpkg --contents (= dpkg-deb --contents) 来列出它们的内容。\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian “" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "”软件包管理程序查询工具\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "用法：" + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ ...\n" @@ -2154,11 +2102,7 @@ msgid "" " dpkg -l|--list [ ...] list packages concisely\n" " dpkg -S|--search ... find package(s) owning file(s)\n" " dpkg -C|--audit check for broken package(s)\n" -" dpkg --print-architecture print target architecture (uses " -"GCC)\n" -" dpkg --print-gnu-build-architecture print GNU version of target arch\n" -" dpkg --print-installation-architecture print host architecture (for " -"inst'n)\n" +" dpkg --print-architecture print dpkg architecture\n" " dpkg --compare-versions compare version numbers - see " "below\n" " dpkg --help | --version show this help / version number\n" @@ -2261,7 +2205,7 @@ msgstr "" "\n" "“dselect”提供了更容易使用的套件管理工具。\n" -#: main/main.c:120 +#: src/main.c:117 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2282,17 +2226,17 @@ msgstr "" "輸入 dpkg --licence 可閱讀版權、許可証和無擔保的說明 (GNU GPL)[*]。\n" "帶有[*]的選項將會輸出較大篇幅的文字 - 可使用管線將其輸出到“less”或“more”！" -#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:162 split/main.c:146 +#: src/main.c:182 src/query.c:506 dpkg-deb/main.c:162 dpkg-split/main.c:145 #, c-format msgid "conflicting actions --%s and --%s" msgstr "操作之間有矛盾 -- %s 和 -- %s" -#: main/main.c:190 +#: src/main.c:187 #, c-format msgid "Warning: obsolete option `--%s'\n" msgstr "警告：已廢棄不用的選項“--%s”\n" -#: main/main.c:198 +#: src/main.c:195 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2329,26 +2273,26 @@ msgstr "" "可以用位元運算(bitwise-or)把除錯選項組合起來使用。\n" "注意，意義和數值將有可能更動。\n" -#: main/main.c:217 +#: src/main.c:214 msgid "--debug requires an octal argument" msgstr "--debug 需要一個八進制的參數" -#: main/main.c:241 +#: src/main.c:238 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "在 --ignore-depends 的用逗號相隔的參數列表“%s”中，發現有的套件名是空的" -#: main/main.c:247 +#: src/main.c:244 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "--ignore-depends 需要一個有效的套件名。而“%.250s”卻不是﹔%s" -#: main/main.c:263 main/main.c:274 +#: src/main.c:260 src/main.c:271 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "--%s 有一個無效的數字參數：“%.250s”" -#: main/main.c:293 +#: src/main.c:290 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2421,73 +2365,73 @@ msgstr "" "警告 - 使用帶有[!]標記的選項可能會嚴重破壞您的系統安裝。\n" "預設情況下，是使用帶有[*]標記的強制方法。\n" -#: main/main.c:338 +#: src/main.c:335 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "無法識別的 force/refuse 選項“%.*s”" -#: main/main.c:441 main/main.c:445 +#: src/main.c:437 src/main.c:441 msgid "couldn't malloc in execbackend" msgstr "無法在 execbackend 中 malloc" -#: main/main.c:443 main/main.c:450 +#: src/main.c:439 src/main.c:446 msgid "couldn't strdup in execbackend" msgstr "無法在 execbackend 中 strdup" -#: main/main.c:454 +#: src/main.c:450 #, c-format msgid "failed to exec %s" msgstr "exec %s 失敗" -#: main/main.c:466 +#: src/main.c:462 msgid "--command-fd takes 1 argument, not 0" msgstr "--command-fd 需要帶一個參數，而不是零個" -#: main/main.c:467 +#: src/main.c:463 msgid "--command-fd only takes 1 argument" msgstr "--command-fd 只需帶一個參數" -#: main/main.c:469 +#: src/main.c:465 msgid "invalid number for --command-fd" msgstr "--command-fd 有一個無效的數字參數" -#: main/main.c:471 +#: src/main.c:467 #, c-format msgid "couldn't open `%i' for stream" msgstr "無法打開“%i”，並把它作為串流處理" -#: main/main.c:496 +#: src/main.c:492 #, c-format msgid "unexpected eof before end of line %d" msgstr "在第 %d 行還未結束時，發現了預料之外的 eof" -#: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:185 -#: split/main.c:159 +#: src/main.c:536 src/main.c:551 src/query.c:541 dpkg-deb/main.c:184 +#: dpkg-split/main.c:157 msgid "need an action option" msgstr "需要一個指示操作的選項" -#: main/packages.c:79 +#: src/packages.c:79 #, c-format msgid "--%s --pending does not take any non-option arguments" msgstr "--%s --pending 不需任何不是選項的參數" -#: main/packages.c:109 main/query.c:297 +#: src/packages.c:109 src/query.c:297 #, c-format msgid "--%s needs at least one package name argument" msgstr "--%s 需要至少一個套件名稱作為參數" -#: main/packages.c:116 +#: src/packages.c:116 msgid "" "you must specify packages by their own names, not by quoting the names of " "the files they come in" msgstr "您必須指定套件本身的名稱，而不是直接引用套件檔案的檔案名" -#: main/packages.c:150 +#: src/packages.c:150 #, c-format msgid "Package %s listed more than once, only processing once.\n" msgstr "多次列出套件 %s，它只處理一次。\n" -#: main/packages.c:154 +#: src/packages.c:154 #, c-format msgid "" "More than one copy of package %s has been unpacked\n" @@ -2496,84 +2440,81 @@ msgstr "" "在這次執行中，套件 %s 有多個副本被解壓縮了！\n" "只設定它一次。\n" -#: main/packages.c:267 main/packages.c:311 main/packages.c:324 +#: src/packages.c:267 src/packages.c:311 src/packages.c:324 msgid " Package " msgstr " 套件 " -#: main/packages.c:270 main/packages.c:314 main/packages.c:327 +#: src/packages.c:270 src/packages.c:314 src/packages.c:327 msgid " which provides " msgstr " 提供了 " -#: main/packages.c:273 +#: src/packages.c:273 msgid " is to be removed.\n" msgstr " 即將被刪除。\n" -#: main/packages.c:285 +#: src/packages.c:285 msgid " Version of " msgstr " 系統裡的 " -#: main/packages.c:287 +#: src/packages.c:287 msgid " on system is " msgstr " 的版本是 " -#: main/packages.c:307 +#: src/packages.c:307 #, c-format msgid "dpkg: also configuring `%s' (required by `%s')\n" msgstr "dpkg：同時也對“%s”進行設定(“%s”需要如此)\n" -#: main/packages.c:317 +#: src/packages.c:317 msgid " is not configured yet.\n" msgstr "還沒有被設定。\n" -#: main/packages.c:330 +#: src/packages.c:330 msgid " is not installed.\n" msgstr "還沒有被安裝。\n" -#. Don't print the line about the package to be removed if -#. * that's the only line. -#. -#: main/packages.c:395 +#: src/packages.c:395 msgid "; however:\n" msgstr "﹔然而：\n" -#: main/processarc.c:102 +#: src/processarc.c:102 msgid "cannot access archive" msgstr "無法存取壓縮檔案" -#: main/processarc.c:112 +#: src/processarc.c:112 #, c-format msgid "error ensuring `%.250s' doesn't exist" msgstr "在確保檔案“%.250s”不存在時出錯" -#: main/processarc.c:117 +#: src/processarc.c:117 msgid "failed to exec dpkg-split to see if it's part of a multiparter" msgstr "" "exec dpkg-split 時出錯，該操作被用來判斷這是否為一個套件(multiparter)中的一個" "部分" -#: main/processarc.c:120 +#: src/processarc.c:120 msgid "wait for dpkg-split failed" msgstr "等待 dpkg-split 子程序失敗" -#: main/processarc.c:126 +#: src/processarc.c:126 msgid "reassembled package file" msgstr "重新組裝成的套件檔案" -#: main/processarc.c:141 +#: src/processarc.c:141 #, c-format msgid "Authenticating %s ...\n" msgstr "正在驗証 %s ...\n" -#: main/processarc.c:146 +#: src/processarc.c:146 msgid "failed to execl debsig-verify" msgstr "無法 execl debsig-verify" -#: main/processarc.c:152 +#: src/processarc.c:152 #, c-format msgid "Verification on package %s failed!" msgstr "套件 %s 沒有通過驗証！" -#: main/processarc.c:154 +#: src/processarc.c:154 #, c-format msgid "" "Verification on package %s failed,\n" @@ -2582,31 +2523,30 @@ msgstr "" "雖然套件 %s 沒能通過驗証，\n" "但還是如您所願繼續安裝它。\n" -#: main/processarc.c:157 +#: src/processarc.c:157 #, c-format msgid "passed\n" msgstr "驗証通過\n" -#. We use tmpnam here, not to get a unique filename, but to get a unique directory. -#: main/processarc.c:166 +#: src/processarc.c:166 msgid "unable to get unique filename for control info" msgstr "控制訊息無法得到唯一的檔案名稱" -#: main/processarc.c:188 +#: src/processarc.c:188 msgid "failed to exec dpkg-deb to extract control information" msgstr "無法 exec dpkg-deb，通過它來解壓縮控制訊息" -#: main/processarc.c:205 +#: src/processarc.c:205 #, c-format msgid "Recorded info about %s from %s.\n" msgstr "從 %2$s 獲得關於 %1$s 的訊息。\n" -#: main/processarc.c:214 +#: src/processarc.c:214 #, c-format msgid "package architecture (%s) does not match system (%s)" msgstr "套件的體系架構(%s)與本機系統的架構(%s)不符" -#: main/processarc.c:265 +#: src/processarc.c:265 #, c-format msgid "" "dpkg: regarding %s containing %s, pre-dependency problem:\n" @@ -2615,144 +2555,322 @@ msgstr "" "dpkg：對於含 %2$s 的檔案 %1$s 來說，有預相依(pre-dependency)方面的問題：\n" "%3$s" -#: main/processarc.c:268 +#: src/processarc.c:268 #, c-format msgid "pre-dependency problem - not installing %.250s" msgstr "預相依(pre-dependency)問題 - 將不安裝%.250s" -#: main/processarc.c:269 +#: src/processarc.c:269 #, c-format msgid "dpkg: warning - ignoring pre-dependency problem !\n" msgstr "dpkg：警告 - 忽視了預相依(pre-dependency)問題！\n" -#: main/processarc.c:283 +#: src/processarc.c:283 #, c-format msgid "Preparing to replace %s %s (using %s) ...\n" msgstr "正預備替換 %s %s (使用 %s) ...\n" -#: main/processarc.c:288 +#: src/processarc.c:288 #, c-format msgid "Unpacking %s (from %s) ...\n" msgstr "正在解壓縮 %s (從 %s) ...\n" -#: main/processarc.c:308 +#: src/processarc.c:308 #, c-format msgid "name of conffile (starting `%.250s') is too long (>%d characters)" msgstr "conffile 的檔案名(其開頭是“%.250s”)過長(> %d 個字元)" -#: main/processarc.c:362 +#: src/processarc.c:362 #, c-format msgid "read error in %.250s" msgstr "在 %.250s 中發生讀取錯誤" -#. conff= fopen() -#: main/processarc.c:364 +#: src/processarc.c:364 #, c-format msgid "error closing %.250s" msgstr "在關閉 %.250s 時發生錯誤" -#: main/processarc.c:366 +#: src/processarc.c:366 #, c-format msgid "error trying to open %.250s" msgstr "當試圖打開 %.250s 時發生錯誤" -#: main/processarc.c:399 +#: src/processarc.c:399 #, c-format msgid "De-configuring %s, so that we can remove %s ...\n" msgstr "正在抹去 %s 的設定訊息，只有這樣我們才能刪除 %s ...\n" -#: main/processarc.c:457 +#: src/processarc.c:457 #, c-format msgid "Unpacking replacement %.250s ...\n" msgstr "正在解壓縮替換的套件檔 %.250s ...\n" -#: main/processarc.c:536 +#: src/processarc.c:536 msgid "unable to exec dpkg-deb to get filesystem archive" msgstr "無法 exec dpkg-deb，以此來獲得打包後的檔案系統" -#: main/processarc.c:549 +#: src/processarc.c:549 msgid "error reading dpkg-deb tar output" msgstr "無法讀取 dpkg-deb 輸出的 tar 檔案" -#: main/processarc.c:551 +#: src/processarc.c:551 msgid "corrupted filesystem tarfile - corrupted package archive" msgstr "檔案系統的 tar 檔案已損壞 - 套件檔案已毀損" -#: main/processarc.c:554 +#: src/processarc.c:554 msgid "dpkg-deb: zap possible trailing zeros" msgstr "dpkg-deb：截去了最後的字元 0(zeros)" -#: main/processarc.c:660 +#: src/processarc.c:660 #, c-format msgid "dpkg: warning - unable to delete old file `%.250s': %s\n" msgstr "dpkg：警告 - 無法刪除原有的檔案“%.250s”：%s\n" -#: main/processarc.c:682 main/processarc.c:919 main/remove.c:285 +#: src/processarc.c:682 src/processarc.c:919 src/remove.c:285 msgid "cannot read info directory" msgstr "無法讀取訊息(info)目錄" -#: main/processarc.c:695 +#: src/processarc.c:695 #, c-format msgid "old version of package has overly-long info file name starting `%.250s'" msgstr "" "原先版本的套件中有一個訊息檔案的檔案名稱過長，檔案名稱是以“%.250s”開頭的" -#: main/processarc.c:707 +#: src/processarc.c:707 #, c-format msgid "unable to remove obsolete info file `%.250s'" msgstr "無法刪除廢棄不用的訊息檔案“%.250s”" -#: main/processarc.c:710 +#: src/processarc.c:710 #, c-format msgid "unable to install (supposed) new info file `%.250s'" msgstr "無法安裝檔案“%.250s”，該檔案被認定是新的訊息檔案" -#: main/processarc.c:717 +#: src/processarc.c:717 msgid "unable to open temp control directory" msgstr "無法打開暫存的主控目錄" -#: main/processarc.c:726 +#: src/processarc.c:726 #, c-format msgid "package contains overly-long control info file name (starting `%.50s')" msgstr "套件中有一個主控訊息檔案的檔案名過長(該檔案名是以“%.250s”開頭的)" -#: main/processarc.c:731 +#: src/processarc.c:731 #, c-format msgid "package control info contained directory `%.250s'" msgstr "套件的主控訊息含有一個目錄“%.250s”" -#: main/processarc.c:733 +#: src/processarc.c:733 #, c-format msgid "package control info rmdir of `%.250s' didn't say not a dir" msgstr "套件控制訊息，rmdir “%.250s”也沒有說這不是一個目錄" -#: main/processarc.c:739 +#: src/processarc.c:739 #, c-format msgid "dpkg: warning - package %s contained list as info file" msgstr "dpkg：警告 - 套件 %s 把一個列表作為訊息檔案使用" -#: main/processarc.c:746 +#: src/processarc.c:746 #, c-format msgid "unable to install new info file `%.250s' as `%.250s'" msgstr "無法把新的訊息檔案“%.250s”安裝到“%.250s”" -#: main/processarc.c:899 +#: src/processarc.c:899 #, c-format msgid "(Noting disappearance of %s, which has been completely replaced.)\n" msgstr "(注意到 %s 已經不復存在，它已被完全取代了。)\n" -#: main/processarc.c:935 +#: src/processarc.c:935 #, c-format msgid "unable to delete disappearing control info file `%.250s'" msgstr "無法刪除已經消失了的控制訊息檔案“%.250s”" -#: main/remove.c:92 +#: src/query.c:140 +msgid "" +"Desired=Unknown/Install/Remove/Purge/Hold\n" +"| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n" +"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: " +"uppercase=bad)\n" +msgstr "" +"期望狀態=未知(u)/安裝(i)/刪除(r)/清除(p)/保持(h)\n" +"| 當前狀態=未(n)/已安裝(i)/僅存設定(c)/僅解壓縮(U)/設定失敗(F)/不完全安裝" +"(H)\n" +"|/ 錯誤？=(無)/保持(?)/須重裝(R)/兩者兼有(#) (狀態，錯誤：大寫=故障)\n" + +#: src/query.c:144 +msgid "Name" +msgstr "名稱" + +#: src/query.c:144 +msgid "Version" +msgstr "版本" + +#: src/query.c:144 dselect/methlist.cc:122 dselect/pkgtop.cc:297 +msgid "Description" +msgstr "簡介" + +#: src/query.c:200 src/query.c:422 src/select.c:80 +#, c-format +msgid "No packages found matching %s.\n" +msgstr "沒有找到與 %s 相匹配的套件。\n" + +#: src/query.c:216 +#, c-format +msgid "diversion by %s" +msgstr "轉移(diversion)到了 %s" + +#: src/query.c:217 +#, c-format +msgid "local diversion" +msgstr "本地轉移項(local diversion)" + +#: src/query.c:218 +msgid "to" +msgstr "到" + +#: src/query.c:218 +msgid "from" +msgstr "從" + +#: src/query.c:251 +msgid "--search needs at least one file name pattern argument" +msgstr "--search 需要至少一個檔案名稱表達式作為參數" + +#: src/query.c:279 +#, c-format +msgid "dpkg: %s not found.\n" +msgstr "dpkg：沒有找到 %s。\n" + +#: src/query.c:317 +#, c-format +msgid "Package `%s' is not installed and no info is available.\n" +msgstr "系統沒有安裝套件“%s”，因而沒有相關的訊息。\n" + +#: src/query.c:326 +#, c-format +msgid "Package `%s' is not available.\n" +msgstr "套件“%s”現在不可用。\n" + +#: src/query.c:336 +#, c-format +msgid "Package `%s' is not installed.\n" +msgstr "未曾安裝套件“%s”。\n" + +#: src/query.c:345 +#, c-format +msgid "Package `%s' does not contain any files (!)\n" +msgstr "套件“%s”未含有任何檔案(!)\n" + +#: src/query.c:351 +#, c-format +msgid "locally diverted" +msgstr "本地轉移(locally diverted)" + +#: src/query.c:352 +#, c-format +msgid "package diverts others" +msgstr "套件是其他套件的轉移項" + +#: src/query.c:353 +#, c-format +msgid "diverted by %s" +msgstr "轉移到了(diverted by) %s" + +#: src/query.c:354 +#, c-format +msgid " to: %s\n" +msgstr " 轉移檔案現指向：%s\n" + +#: src/query.c:373 +msgid "" +"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n" +"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n" +msgstr "" +"使用 dpkg --info (= dpkg-deb --info) 來檢測打包好的檔案，\n" +"還可以用過 dpkg --contents (= dpkg-deb --contents) 來列出它們的內容。\n" + +#: src/query.c:434 dpkg-deb/main.c:46 +msgid "Debian `" +msgstr "Debian “" + +#: src/query.c:436 +msgid "' package management program query tool\n" +msgstr "”套件管理程序查詢工具\n" + +#: src/query.c:448 +#, c-format +msgid "Usage: " +msgstr "用法：" + +#: src/query.c:449 +#, fuzzy, c-format +msgid "" +" [ compare version numbers - see below\n\ dpkg --help | --version show this help / version number\n\ dpkg --force-help | -Dh|--debug=help help on forcing resp. debugging\n\ @@ -378,13 +375,12 @@ static const struct cmdinfo cmdinfos[]= { ACTION( "yet-to-unpack", 0, act_unpackchk, unpackchk ), ACTIONBACKEND( "list", 'l', DPKGQUERY), ACTIONBACKEND( "search", 'S', DPKGQUERY), - ACTION( "print-architecture", 0, act_printarch, printarch ), - ACTION( "print-gnu-build-architecture", 0, act_printgnuarch, printarch ), ACTION( "assert-support-predepends", 0, act_assertpredep, assertpredep ), ACTION( "assert-working-epoch", 0, act_assertepoch, assertepoch ), ACTION( "assert-long-filenames", 0, act_assertlongfilenames, assertlongfilenames ), ACTION( "assert-multi-conrep", 0, act_assertmulticonrep, assertmulticonrep ), - ACTION( "print-installation-architecture", 0, act_printinstarch, printinstarch ), + ACTION( "print-architecture", 0, act_printarch, printarch ), + ACTION( "print-installation-architecture", 0, act_printinstarch, printarch ), ACTION( "predep-package", 0, act_predeppackage, predeppackage ), ACTION( "compare-versions", 0, act_cmpversions, cmpversions ), /* diff --git a/main/main.h b/src/main.h similarity index 99% rename from main/main.h rename to src/main.h index 37811ee0..7c6e33e0 100644 --- a/main/main.h +++ b/src/main.h @@ -53,7 +53,7 @@ enum action { act_unset, act_install, act_unpack, act_avail, act_configure, act_unpackchk, act_status, act_searchfiles, act_audit, act_listfiles, act_assertpredep, act_printarch, act_predeppackage, act_cmpversions, act_printinstarch, act_compareversions, act_printavail, act_avclear, - act_forgetold, act_getselections, act_setselections, act_printgnuarch, + act_forgetold, act_getselections, act_setselections, act_assertepoch, act_assertlongfilenames, act_assertmulticonrep, act_commandfd }; diff --git a/main/packages.c b/src/packages.c similarity index 100% rename from main/packages.c rename to src/packages.c diff --git a/main/processarc.c b/src/processarc.c similarity index 100% rename from main/processarc.c rename to src/processarc.c diff --git a/main/query.c b/src/query.c similarity index 99% rename from main/query.c rename to src/query.c index d4d8e81d..8b43daf1 100644 --- a/main/query.c +++ b/src/query.c @@ -459,7 +459,7 @@ Commands:\n\ \n\ Options:\n\ --admindir= Use instead of %s\n\ - --showformat= Use alternative format for --show\n\ + -f|--showformat= Use alternative format for --show\n\ \n\ Format syntax:\n\ A format is a string that will be output for each package. The format\n\ @@ -525,7 +525,7 @@ static const struct cmdinfo cmdinfos[]= { ACTION( "show", 'W', act_listpackages, showpackages ), { "admindir", 0, 1, 0, &admindir, 0 }, - { "showformat", 0, 1, 0, &showformat, 0 }, + { "showformat", 'f', 1, 0, &showformat, 0 }, { "help", 'h', 0, 0, 0, helponly }, { "version", 0, 0, 0, 0, versiononly }, { "licence",/* UK spelling */ 0,0,0,0, showcopyright }, diff --git a/main/remove.c b/src/remove.c similarity index 100% rename from main/remove.c rename to src/remove.c diff --git a/main/select.c b/src/select.c similarity index 100% rename from main/select.c rename to src/select.c diff --git a/main/update.c b/src/update.c similarity index 100% rename from main/update.c rename to src/update.c diff --git a/utils/Makefile b/utils/Makefile deleted file mode 100644 index e63191a3..00000000 --- a/utils/Makefile +++ /dev/null @@ -1,80 +0,0 @@ - - -srcdir = . -top_srcdir = .. - -default: all -include ../Makefile.conf - -CFLAGS += -I$(top_srcdir)/optlib - -SSD_SOURCES = start-stop-daemon.c -SSD_OBJECTS = $(patsubst %.c, %.o, $(SSD_SOURCES)) -SSD_MANPAGES = start-stop-daemon.8 - -MD5_SOURCES = md5sum.c -MD5_OBJECTS = $(patsubst %.c, %.o, $(MD5_SOURCES)) -MD5_MANPAGES = md5sum.1 - -ENOENT_SOURCES = enoent.c -ENOENT_OBJECTS = $(patsubst %.c, %.o, $(ENOENT_SOURCES)) - -GENFILES = $(MD5_OBJECTS) md5sum md5sum-static $(ENOENT_OBJECTS) enoent -ifeq (true, true) -GENFILES += $(SSD_OBJECTS) start-stop-daemon -endif - -.PHONY: all -ifeq (true, true) -all:: start-stop-daemon md5sum enoent -else -all:: md5sum enoent -endif - -.PHONY: install -install:: all -ifdef ALSO_STATIC -all:: md5sum-static -endif - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile confdefs.h config.log - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: -ifeq (true, true) - $(mkinstalldirs) $(DESTDIR)/$(sbindir) - $(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir) -endif - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir) -ifdef ALSO_STATIC - $(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir) -endif - $(mkinstalldirs) $(DESTDIR)/$(dpkglibdir) - $(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir) - -.PHONY: install-doc -install-doc: -ifeq (true, true) - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - $(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir) -endif - $(mkinstalldirs) $(DESTDIR)/$(man1dir) - $(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir) - -start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS) - -md5sum-static: LDFLAGS += -static -md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC) -md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS) diff --git a/utils/Makefile.am b/utils/Makefile.am new file mode 100644 index 00000000..5318bc03 --- /dev/null +++ b/utils/Makefile.am @@ -0,0 +1,31 @@ +## Process this file with automake to produce Makefile.in + +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/getopt \ + -I$(top_srcdir)/lib + + +bin_PROGRAMS = md5sum + +md5sum_SOURCES = \ + md5sum.c + +md5sum_LDADD = $(LIBINTL) ../getopt/libopt.a ../lib/libdpkg.a $(ZLIB_LIBS) + + +if WITH_START_STOP_DAEMON + sbin_PROGRAMS = start-stop-daemon + + start_stop_daemon_SOURCES = \ + start-stop-daemon.c + + start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS) +endif + + +pkglib_PROGRAMS = enoent + +enoent_SOURCES = \ + enoent.c diff --git a/utils/Makefile.in b/utils/Makefile.in index c4e486ee..6676cf21 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -1,80 +1,566 @@ +# Makefile.in generated by automake 1.8.5 from Makefile.am. +# @configure_input@ -VPATH = @srcdir@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ - -default: all -include ../Makefile.conf - -CFLAGS += -I$(top_srcdir)/optlib - -SSD_SOURCES = start-stop-daemon.c -SSD_OBJECTS = $(patsubst %.c, %.o, $(SSD_SOURCES)) -SSD_MANPAGES = start-stop-daemon.8 - -MD5_SOURCES = md5sum.c -MD5_OBJECTS = $(patsubst %.c, %.o, $(MD5_SOURCES)) -MD5_MANPAGES = md5sum.1 - -ENOENT_SOURCES = enoent.c -ENOENT_OBJECTS = $(patsubst %.c, %.o, $(ENOENT_SOURCES)) - -GENFILES = $(MD5_OBJECTS) md5sum md5sum-static $(ENOENT_OBJECTS) enoent -ifeq (@USE_START_STOP_DAEMON@, true) -GENFILES += $(SSD_OBJECTS) start-stop-daemon -endif - -.PHONY: all -ifeq (@USE_START_STOP_DAEMON@, true) -all:: start-stop-daemon md5sum enoent -else -all:: md5sum enoent -endif - -.PHONY: install -install:: all -ifdef ALSO_STATIC -all:: md5sum-static -endif - -.PHONY: clean -clean:: - $(RM) $(GENFILES) - -.PHONY: distclean -cvslean:: clean - $(RM) Makefile confdefs.h config.log - -.PHONY: install -install:: install-program install-doc - -.PHONY: install-program -install-program: -ifeq (@USE_START_STOP_DAEMON@, true) - $(mkinstalldirs) $(DESTDIR)/$(sbindir) - $(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir) -endif - $(mkinstalldirs) $(DESTDIR)/$(bindir) - $(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir) -ifdef ALSO_STATIC - $(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir) -endif - $(mkinstalldirs) $(DESTDIR)/$(dpkglibdir) - $(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir) - -.PHONY: install-doc -install-doc: -ifeq (@USE_START_STOP_DAEMON@, true) - $(mkinstalldirs) $(DESTDIR)/$(man8dir) - $(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir) -endif - $(mkinstalldirs) $(DESTDIR)/$(man1dir) - $(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir) - -start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS) - -md5sum-static: LDFLAGS += -static -md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC) -md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS) +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 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. + +# 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. + +@SET_MAKE@ + +SOURCES = $(enoent_SOURCES) $(md5sum_SOURCES) $(start_stop_daemon_SOURCES) + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +bin_PROGRAMS = md5sum$(EXEEXT) +@WITH_START_STOP_DAEMON_TRUE@sbin_PROGRAMS = \ +@WITH_START_STOP_DAEMON_TRUE@ start-stop-daemon$(EXEEXT) +pkglib_PROGRAMS = enoent$(EXEEXT) +subdir = utils +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \ + $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intmax.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libs.m4 \ + $(top_srcdir)/m4/linker.m4 $(top_srcdir)/m4/longdouble.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/perl.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/types.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS) $(sbin_PROGRAMS) +am_enoent_OBJECTS = enoent.$(OBJEXT) +enoent_OBJECTS = $(am_enoent_OBJECTS) +enoent_LDADD = $(LDADD) +am_md5sum_OBJECTS = md5sum.$(OBJEXT) +md5sum_OBJECTS = $(am_md5sum_OBJECTS) +am__DEPENDENCIES_1 = +md5sum_DEPENDENCIES = $(am__DEPENDENCIES_1) ../getopt/libopt.a \ + ../lib/libdpkg.a $(am__DEPENDENCIES_1) +am__start_stop_daemon_SOURCES_DIST = start-stop-daemon.c +@WITH_START_STOP_DAEMON_TRUE@am_start_stop_daemon_OBJECTS = \ +@WITH_START_STOP_DAEMON_TRUE@ start-stop-daemon.$(OBJEXT) +start_stop_daemon_OBJECTS = $(am_start_stop_daemon_OBJECTS) +@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_DEPENDENCIES = \ +@WITH_START_STOP_DAEMON_TRUE@ ../getopt/libopt.a \ +@WITH_START_STOP_DAEMON_TRUE@ $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/enoent.Po ./$(DEPDIR)/md5sum.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/start-stop-daemon.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(enoent_SOURCES) $(md5sum_SOURCES) \ + $(start_stop_daemon_SOURCES) +DIST_SOURCES = $(enoent_SOURCES) $(md5sum_SOURCES) \ + $(am__start_stop_daemon_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BZ2_CFLAGS = @BZ2_CFLAGS@ +BZ2_LIBS = @BZ2_LIBS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURSES_LIBS = @CURSES_LIBS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GENCAT = @GENCAT@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSD_LIBS = @SSD_LIBS@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WITH_DSELECT_FALSE = @WITH_DSELECT_FALSE@ +WITH_DSELECT_TRUE = @WITH_DSELECT_TRUE@ +WITH_START_STOP_DAEMON_FALSE = @WITH_START_STOP_DAEMON_FALSE@ +WITH_START_STOP_DAEMON_TRUE = @WITH_START_STOP_DAEMON_TRUE@ +XGETTEXT = @XGETTEXT@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +admindir = @admindir@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +localedir = $(datadir)/locale +INCLUDES = \ + -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \ + -I$(top_srcdir)/getopt \ + -I$(top_srcdir)/lib + +md5sum_SOURCES = \ + md5sum.c + +md5sum_LDADD = $(LIBINTL) ../getopt/libopt.a ../lib/libdpkg.a $(ZLIB_LIBS) +@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_SOURCES = \ +@WITH_START_STOP_DAEMON_TRUE@ start-stop-daemon.c + +@WITH_START_STOP_DAEMON_TRUE@start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS) +enoent_SOURCES = \ + enoent.c + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utils/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu utils/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +install-pkglibPROGRAMS: $(pkglib_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" + @list='$(pkglib_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-pkglibPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibPROGRAMS: + -test -z "$(pkglib_PROGRAMS)" || rm -f $(pkglib_PROGRAMS) +install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-sbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ + done + +clean-sbinPROGRAMS: + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) +enoent$(EXEEXT): $(enoent_OBJECTS) $(enoent_DEPENDENCIES) + @rm -f enoent$(EXEEXT) + $(LINK) $(enoent_LDFLAGS) $(enoent_OBJECTS) $(enoent_LDADD) $(LIBS) +md5sum$(EXEEXT): $(md5sum_OBJECTS) $(md5sum_DEPENDENCIES) + @rm -f md5sum$(EXEEXT) + $(LINK) $(md5sum_LDFLAGS) $(md5sum_OBJECTS) $(md5sum_LDADD) $(LIBS) +start-stop-daemon$(EXEEXT): $(start_stop_daemon_OBJECTS) $(start_stop_daemon_DEPENDENCIES) + @rm -f start-stop-daemon$(EXEEXT) + $(LINK) $(start_stop_daemon_LDFLAGS) $(start_stop_daemon_OBJECTS) $(start_stop_daemon_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enoent.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5sum.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/start-stop-daemon.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-pkglibPROGRAMS \ + clean-sbinPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-binPROGRAMS install-pkglibPROGRAMS \ + install-sbinPROGRAMS + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-pkglibPROGRAMS uninstall-sbinPROGRAMS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-pkglibPROGRAMS clean-sbinPROGRAMS ctags \ + distclean distclean-compile distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-pkglibPROGRAMS install-sbinPROGRAMS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-info-am uninstall-pkglibPROGRAMS \ + uninstall-sbinPROGRAMS + +# 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/utils/md5sum.c b/utils/md5sum.c index 3105ce4e..29cdc4f1 100644 --- a/utils/md5sum.c +++ b/utils/md5sum.c @@ -22,26 +22,6 @@ #include #include -/* Take care of NLS matters. */ - -#if HAVE_LOCALE_H -# include -#endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) /* empty */ -#endif - -#if ENABLE_NLS -# include -# define _(Text) gettext (Text) -#else -# undef bindtextdomain -# define bindtextdomain(Domain, Directory) /* empty */ -# undef textdomain -# define textdomain(Domain) /* empty */ -# define _(Text) Text -#endif - #include #ifdef UNIX @@ -127,7 +107,7 @@ main(int argc, char **argv) push_error_handler(&ejbuf, print_md5sum_error, "stdin"); mdfile(fileno(stdin), &digest); - printf("%s %c-\n", digest, bin_mode ? '*' : ' '); + printf("%s\n", digest); set_error_display(0, 0); error_unwind(ehflag_normaltidy); exit(0); diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 67360889..343905f8 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -22,7 +22,7 @@ #include "config.h" -#if defined(linux) +#if defined(linux) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) # define OSLinux #elif defined(__GNU__) # define OSHURD @@ -47,18 +47,21 @@ # include #endif -#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) +#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) #include -#include #include #include -#include #include - + #include -#include #include #endif + +#ifdef HAVE_KVM_H +#include +#include +#include +#endif #if defined(OShpux) #include @@ -86,10 +89,32 @@ #include #include +#ifdef HAVE_SYS_CDEFS_H +#include +#endif + +#ifdef HAVE_STDDEF_H +#include +#endif + #ifdef HAVE_ERROR_H # include #endif +#if HAVE_C_ATTRIBUTE +# define CONSTANT __attribute__((constant)) +# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc))) +# define NONRETURNING __attribute__((noreturn)) +# define UNUSED __attribute__((unused)) +# define NONRETURNPRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc),noreturn)) +#else +# define CONSTANT +# define PRINTFFORMAT(si, tc) +# define NONRETURNING +# define UNUSED +# define NONRETURNPRINTFFORMAT(si, tc) +#endif + static int testmode = 0; static int quietmode = 0; static int exitnodo = 1; @@ -204,7 +229,7 @@ fatal(const char *format, ...) va_start(arglist, format); vfprintf(stderr, format, arglist); va_end(arglist); - putc('\n', stderr); + fprintf(stderr, " (%s)\n", strerror (errno)); exit(2); } @@ -756,7 +781,7 @@ do_pidfile(const char *name) /* WTA: this needs to be an autoconf check for /proc/pid existance. */ -#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) +#if defined(OSLinux) || defined (OSsunos) static void do_procinit(void) { @@ -802,7 +827,7 @@ do_procinit(void) #endif /* OSHURD */ -#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) +#ifdef HAVE_KVM_H static int pid_is_cmd(pid_t pid, const char *name) { @@ -1142,7 +1167,6 @@ x_finished: } -int main(int argc, char **argv) NONRETURNING; int main(int argc, char **argv) { diff --git a/version-nr b/version-nr deleted file mode 100644 index 09a92393..00000000 --- a/version-nr +++ /dev/null @@ -1 +0,0 @@ -1.10.28