diff -Naur gphoto2-2.1.4/ABOUT-NLS gphoto2/ABOUT-NLS --- gphoto2-2.1.4/ABOUT-NLS 2003-10-08 17:26:31.000000000 +0200 +++ gphoto2/ABOUT-NLS 2004-10-18 16:09:15.423075405 +0200 @@ -1,8 +1,8 @@ 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 +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all together, so that will gradually become able to speak many languages. A few packages already provide translations for their messages. @@ -25,7 +25,7 @@ Quick configuration advice ========================== - If you want to exploit the full power of internationalization, you +If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -48,10 +48,10 @@ INSTALL Matters =============== - Some packages are "localizable" when properly installed; the -programs they contain can be made to speak your own native language. -Most such packages use GNU `gettext'. Other packages have their own -ways to internationalization, predating GNU `gettext'. +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already @@ -98,7 +98,7 @@ Using This Package ================== - As a user, if your language has been installed for this package, you +As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -131,6 +131,13 @@ read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent @@ -140,7 +147,7 @@ Translating Teams ================= - For the Free Translation Project to be a success, we need interested +For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -170,423 +177,559 @@ Available Packages ================== - Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of May 2003. -The matrix shows, in regard of each package, for which languages PO -files have been submitted to translation coordination, with a +Languages are not equally supported in all packages. The following +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 am az be bg ca cs da de el en en_GB eo es - +-------------------------------------------+ - a2ps | [] [] [] [] | - aegis | () | - anubis | | - ap-utils | | - bash | [] [] [] | - batchelor | | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - bluez-pin | [] [] | - clisp | | - clisp | [] [] [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - darkstat | () [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] () [] [] [] [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] | - gas | [] | - gawk | [] [] [] [] | - gcal | [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] [] | - gliv | | - glunarclock | [] [] [] | - gnucash | () [] | - gnucash-glossary | [] () [] | - gnupg | [] () [] [] [] [] | - gpe-calendar | [] | - gpe-conf | [] | - gpe-contacts | [] | - gpe-edit | | - gpe-login | [] | - gpe-ownerinfo | [] | - gpe-sketchbook | [] | - gpe-timesheet | | - gpe-today | [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () () | - grep | [] [] [] [] [] | - gretl | [] | - hello | [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - jpilot | [] [] [] [] | - jwhois | [] | - kbd | [] [] [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] | - libiconv | [] [] [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lingoteach_lessons | () () | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] | - man-db | [] () [] [] () | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] | - nano_1_0 | [] () [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] | - python | | - radius | | - recode | [] [] [] [] [] [] | - screem | | - sed | [] [] [] [] [] | - sh-utils | [] [] [] | - sharutils | [] [] [] [] [] [] | - sketch | [] () [] | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] [] | - tin | () () | - util-linux | [] [] [] [] [] | - vorbis-tools | [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] [] | - xchat | [] [] [] | - xpad | | - +-------------------------------------------+ - am az be bg ca cs da de el en en_GB eo es - 0 1 4 2 31 17 54 60 14 1 4 12 56 + 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 fa fi fr ga gl he hr hu id it ja ko - +----------------------------------------+ - a2ps | [] [] [] () () | - aegis | | - anubis | [] | - ap-utils | [] | - bash | [] [] | - batchelor | [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] [] | - bluez-pin | [] [] [] [] | - clisp | | - clisp | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] [] | - darkstat | () [] [] [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | | - enscript | [] [] | - error | [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] [] [] [] | - flex | [] [] | - gas | [] | - gawk | [] [] | - gcal | [] | - gcc | [] | - gettext | [] [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] | - gimp-print | [] [] | - gliv | () | - glunarclock | [] [] [] [] | - gnucash | [] | - gnucash-glossary | [] | - gnupg | [] [] [] [] [] [] [] | - gpe-calendar | [] | - gpe-conf | | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-login | [] | - gpe-ownerinfo | [] [] [] | - gpe-sketchbook | [] | - gpe-timesheet | [] [] [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] | - gprof | [] [] | - gpsdrive | () [] () () | - grep | [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] [] [] [] | - jpilot | [] () | - jwhois | [] [] [] [] | - kbd | [] | - ld | [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] [] | - libiconv | [] [] [] [] [] [] [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] | - lingoteach_lessons | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | | - make | [] [] [] [] [] [] | - man-db | [] () () | - mysecretdiary | [] [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | | - recode | [] [] [] [] [] [] | - screem | | - sed | [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] | - sketch | [] | - soundtracker | [] [] [] | - sp | [] () | - tar | [] [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - util-linux | [] [] [] [] () [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] | - xpad | | - +----------------------------------------+ - et fa fi fr ga gl he hr hu id it ja ko - 20 1 15 73 14 24 8 10 30 31 19 31 9 + et eu fa fi fr ga gl he hr hu id is it ja ko lg + +-------------------------------------------------+ + 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 | [] [] | + +-------------------------------------------------+ + 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 - lg lt lv ms nb nl nn no pl pt pt_BR ro - +----------------------------------------+ - a2ps | [] [] () () () [] [] | - aegis | () | - anubis | [] [] | - ap-utils | () | - bash | [] | - batchelor | | - bfd | | - binutils | | - bison | [] [] [] [] | - bluez-pin | [] | - clisp | | - clisp | [] | - coreutils | [] | - cpio | [] [] [] | - darkstat | [] [] [] [] | - diffutils | [] [] [] | - e2fsprogs | | - enscript | [] [] | - error | [] [] | - fetchmail | () () | - fileutils | [] | - findutils | [] [] [] [] | - flex | [] | - gas | | - gawk | [] | - gcal | | - gcc | | - gettext | [] | - gettext-runtime | [] | - gettext-tools | | - gimp-print | [] | - gliv | [] | - glunarclock | [] | - gnucash | | - gnucash-glossary | [] [] | - gnupg | | - gpe-calendar | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-timesheet | [] [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | | - gprof | [] | - gpsdrive | () () () | - grep | [] [] [] [] | - gretl | | - hello | [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] | - jpilot | () () | - jwhois | [] [] [] | - kbd | | - ld | | - libc | [] [] [] [] | - libgpewidget | [] [] | - libiconv | [] [] | - lifelines | | - lilypond | [] | - lingoteach | | - lingoteach_lessons | | - lynx | [] [] | - m4 | [] [] [] [] | - mailutils | | - make | [] [] | - man-db | [] | - mysecretdiary | [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | | - recode | [] [] [] | - screem | | - sed | [] [] | - sh-utils | [] | - sharutils | [] | - sketch | [] | - soundtracker | | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] | - textutils | [] | - tin | | - util-linux | [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] | - wget | [] [] [] | - xchat | [] [] | - xpad | [] | - +----------------------------------------+ - lg lt lv ms nb nl nn no pl pt pt_BR ro - 0 0 2 11 7 26 3 4 18 15 34 34 + 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 - ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW - +-------------------------------------------+ - a2ps | [] [] [] [] [] | 16 - aegis | () | 0 - anubis | [] [] | 5 - ap-utils | () | 1 - bash | [] | 7 - batchelor | | 1 - bfd | [] [] [] | 7 - binutils | [] [] [] | 7 - bison | [] [] | 13 - bluez-pin | | 7 - clisp | | 0 - clisp | | 5 - coreutils | [] [] [] [] [] | 14 - cpio | [] [] [] | 13 - darkstat | [] () () | 9 - diffutils | [] [] [] [] | 21 - e2fsprogs | [] | 3 - enscript | [] [] [] | 11 - error | [] [] [] | 14 - fetchmail | [] | 7 - fileutils | [] [] [] [] [] [] | 15 - findutils | [] [] [] [] [] [] | 27 - flex | [] [] [] | 10 - gas | [] | 3 - gawk | [] [] | 9 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] [] | 15 - gettext-runtime | [] [] [] [] [] [] | 16 - gettext-tools | [] [] | 5 - gimp-print | [] [] | 10 - gliv | | 1 - glunarclock | [] [] [] | 11 - gnucash | [] [] | 4 - gnucash-glossary | [] [] [] | 8 - gnupg | [] [] [] [] | 16 - gpe-calendar | [] | 5 - gpe-conf | | 3 - gpe-contacts | [] | 4 - gpe-edit | [] | 5 - gpe-login | [] | 5 - gpe-ownerinfo | [] | 7 - gpe-sketchbook | [] | 5 - gpe-timesheet | [] | 6 - gpe-today | [] | 6 - gpe-todo | [] | 6 - gphoto2 | [] [] | 9 - gprof | [] [] | 7 - gpsdrive | [] [] | 3 - grep | [] [] [] [] | 24 - gretl | | 2 - hello | [] [] [] [] [] | 33 - id-utils | [] [] [] | 11 - indent | [] [] [] [] | 19 - jpilot | [] [] [] [] [] | 10 - jwhois | () () [] [] | 10 - kbd | [] [] | 8 - ld | [] [] | 5 - libc | [] [] [] [] | 20 - libgpewidget | | 6 - libiconv | [] [] [] [] [] [] | 21 - lifelines | [] | 2 - lilypond | [] | 4 - lingoteach | | 2 - lingoteach_lessons | () | 0 - lynx | [] [] [] [] | 14 - m4 | [] [] [] | 15 - mailutils | | 2 - make | [] [] [] [] | 15 - man-db | [] | 6 - mysecretdiary | [] [] | 8 - nano | [] [] [] | 15 - nano_1_0 | [] [] [] | 15 - opcodes | [] [] | 9 - parted | [] [] | 13 - ptx | [] [] [] | 22 - python | | 0 - radius | | 0 - recode | [] [] [] [] | 19 - screem | [] | 1 - sed | [] [] [] [] [] | 20 - sh-utils | [] [] [] | 13 - sharutils | [] [] [] [] | 16 - sketch | [] | 5 - soundtracker | [] | 7 - sp | [] | 3 - tar | [] [] [] [] [] | 24 - texinfo | [] [] [] [] | 13 - textutils | [] [] [] [] [] | 15 - tin | | 1 - util-linux | [] [] | 14 - vorbis-tools | [] | 7 - wastesedge | | 0 - wdiff | [] [] [] [] | 17 - wget | [] [] [] [] [] [] [] | 25 - xchat | [] [] [] | 11 - xpad | | 1 - +-------------------------------------------+ - 50 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW - 97 domains 32 19 16 0 56 0 48 10 1 1 12 23 913 + 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 @@ -599,7 +742,7 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If May 2003 seems to be old, you may fetch a more recent copy of + 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'. @@ -607,7 +750,7 @@ Using `gettext' in new packages =============================== - If you are writing a freely available program and want to +If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means diff -Naur gphoto2-2.1.4/aclocal.m4 gphoto2/aclocal.m4 --- gphoto2-2.1.4/aclocal.m4 2004-01-18 21:01:14.000000000 +0100 +++ gphoto2/aclocal.m4 2004-10-18 16:09:48.455848134 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.7.8 -*- Autoconf -*- +# generated automatically by aclocal 1.9.1 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,158 +11,67 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_PREREQ([2.52]) - -# serial 6 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. -# Copyright (C) 1996, 1997, 1998, 1999, 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. +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no -# 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 -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + 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. + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) -# serial 10 + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes -AC_PREREQ([2.54]) + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([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 + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + 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' + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) else - CYGPATH_W=echo + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) fi -fi -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 -# 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 -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -# Copyright 2002 Free Software Foundation, Inc. +# -*- Autoconf -*- +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Generated from amversion.in; do not edit by hand. # 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 @@ -182,18 +91,18 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.8])]) + [AM_AUTOMAKE_VERSION([1.9.1])]) -# Helper functions for option handling. -*- Autoconf -*- +# AM_AUX_DIR_EXPAND -# Copyright 2001, 2002 Free Software Foundation, Inc. +# 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 @@ -210,36 +119,54 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - +# 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/../..'. # -# Check to make sure that the build environment is sane. +# 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` +]) + +# AM_CONDITIONAL -*- Autoconf -*- -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 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 @@ -256,261 +183,34 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 3 +# serial 6 -# 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 - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -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 -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# 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. - -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# 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])]) - -# -*- 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=. +# 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 - am__leading_dot=_ + $1_TRUE='#' + $1_FALSE= fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +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 5 -*- Autoconf -*- +# serial 7 -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 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 @@ -594,7 +294,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # 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 @@ -622,9 +324,14 @@ 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 - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # 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 @@ -658,8 +365,8 @@ # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --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='\' @@ -670,7 +377,8 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 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 @@ -706,27 +414,21 @@ else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. 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 " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -752,9 +454,9 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# 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 @@ -771,53 +473,141 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 2 +# serial 7 -# 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 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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. + +# 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 -# 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 + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf +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_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([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_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 +]) ]) -# AM_CONDITIONAL -*- Autoconf -*- -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. 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 +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 @@ -834,35 +624,49 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 5 +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)]) -AC_PREREQ(2.52) +# -*- Autoconf -*- +# Copyright (C) 2003 Free Software Foundation, Inc. -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[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='#' +# 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 - $1_TRUE='#' - $1_FALSE= + am__leading_dot=_ 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])]) +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering -# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 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 @@ -879,14 +683,14 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 2 +# serial 3 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) @@ -898,2106 +702,468 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# gettext.m4 serial 20 (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. - -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([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - 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_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ -__fsetlocking]) - - 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 -]) +# Check to see how 'make' treats includes. -*- Autoconf -*- +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# po.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. - -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 +# 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, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - GMOFILES= - UPDATEPOFILES= - DUMMYPOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -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, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, 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 2 -# 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) +# 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 ]) -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) -]) +# -*- Autoconf -*- -# 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 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. -# 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) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +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 - AC_MSG_RESULT(no) + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) fi -AC_SUBST($1)dnl ]) -# lib-prefix.m4 serial 2 (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_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 -]) +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -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" -]) +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. -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" -]) +# 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. -# 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]) -]) +# 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_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]) +# 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. + +# 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 + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + 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 - 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= + mkdir_p='$(install_sh) -d' fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) +fi +AC_SUBST([mkdir_p])]) -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) -]) +# Helper functions for option handling. -*- Autoconf -*- -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 -]) +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -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 -]) +# 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. -# lib-ld.m4 serial 2 (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 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. -if $LD -v 2>&1 &5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) +# 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 From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - 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. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -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 -]) +# 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. -# 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]) -]) +# serial 2 -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) -]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -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 -]) +# _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)]) -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) +# _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)])]) -# 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" - ] -) +# _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])]) -# 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.]) -]) +# +# Check to make sure that the build environment is sane. +# -# 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 -]) +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. -# inttypes_h.m4 serial 5 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -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 -]) +# 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. -# 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 -]) +# 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. -# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -[ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], - [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 -]) +# 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. -# 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 -]) +# serial 3 -# 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 -]) +# 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 -# 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 -]) + # 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 -# 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 -]) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) +# AM_PROG_INSTALL_STRIP -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - 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 "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) +# 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 $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=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. - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) +# 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])]) - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi +# Check how to create a tarball. -*- Autoconf -*- - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi +# Copyright (C) 2004 Free Software Foundation, Inc. - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - 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. + +# 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 + + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/codeset.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/longdouble.m4]) +m4_include([m4/longlong.m4]) +m4_include([m4/nls.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/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 -Naur gphoto2-2.1.4/ChangeLog gphoto2/ChangeLog --- gphoto2-2.1.4/ChangeLog 2004-01-18 21:01:14.000000000 +0100 +++ gphoto2/ChangeLog 2004-09-12 20:00:32.000000000 +0200 @@ -1,13 +1,65 @@ -2004-01-18 gettextize +2004-09-11 Marcus Meissner - * Makefile.am (SUBDIRS): Add intl, - (ACLOCAL_AMFLAGS): New variable. - (EXTRA_DIST): New variable. - * configure.in (AC_OUTPUT): Add intl/Makefile, + * gphoto2/actions.[ch],main.c: Added -2004-01-18 Hans Ulrich Niedermann + --list-config - dump the configuration tree of the camera + --get-config var - get the configuration entry + +2004-07-26 Colin Marquardt + + * configure.in (ALL_LINGUAS): Added nl + * nl.po: New Dutch translation, courtesy Julie Vermeersch. + +2004-07-09 Colin Marquardt + + * configure.in (ALL_LINGUAS): Added fi + * fi.po: New Finnish translation, courtesy Matti Pll. + +2004-06-10 Hubert Figuiere + + * configure.in (ALL_LINGUAS): Added hu + +2004-06-04 Lutz Mueller + + * configure.in + * exif/actions.c: Make gphoto2 compile with libexif-0.6.9. + +2004-04-20 Colin Marquardt + + * po/uk.po: Update. + * po/en_GB.po: New English (British) translation, courtesy Gareth Owen. + * configure.in: Add en_GB to ALL_LINGUAS. + +2004-04-20 Marcus Meissner + + Patch by Darryl Sokoloski + + * gphoto2/main.c: Added + --frames=count + --interval=seconds + capture sub options. + + Cleaned up, corrected translations. + + * gphoto2/main.h: Increased option description length. + +2004-03-23 Lutz Mueller + + Patch by Michael Haardt : + + * gphoto2/gphoto2-cmd-config.c: Allow ranges like 1.5 ... 5.5 with + increments of 1. + +2004-03-22 Colin Marquardt + + * po/az.po: New Azerbaijani translation, courtesy Metin Amiroff. + * po/sr.po: New Serbian translation, courtesy Aleksandar Jelenak. + * configure.in: Add az and sr to ALL_LINGUAS. + +2004-02-17 Christophe Barbe - * configure.in: Release 2.1.4 + * gphoto2/shell.c: Fixed shell_command_generator function + that was enough to only segfault on alpha. 2004-01-04 Christophe Barbe diff -Naur gphoto2-2.1.4/config.guess gphoto2/config.guess --- gphoto2-2.1.4/config.guess 2003-10-08 17:21:39.000000000 +0200 +++ gphoto2/config.guess 2004-10-18 16:10:25.410000324 +0200 @@ -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 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-10-03' +timestamp='2004-08-11' # 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 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -197,15 +197,24 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; 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 ;; @@ -236,10 +245,24 @@ *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,14 +300,12 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -307,6 +328,9 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -399,6 +423,9 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -734,7 +761,7 @@ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-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'` @@ -742,6 +769,11 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -751,22 +783,8 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # 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/FreeBSD 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} + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -799,8 +817,13 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; @@ -813,6 +836,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -981,6 +1007,9 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1050,9 +1079,9 @@ M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*: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) + 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) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1150,9 +1179,10 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1167,7 +1197,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1211,6 +1241,16 @@ SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *: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 esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Naur gphoto2-2.1.4/config.h.in gphoto2/config.h.in --- gphoto2-2.1.4/config.h.in 2004-01-18 21:01:18.000000000 +0100 +++ gphoto2/config.h.in 2004-10-18 16:10:01.185833677 +0200 @@ -25,6 +25,9 @@ /* 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 + /* The C compiler we're using */ #undef HAVE_CC @@ -38,24 +41,41 @@ */ #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 `_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 + /* whether we use libexif */ #undef HAVE_EXIF /* whether we use a version of libexif greater than 0.5.3 */ #undef HAVE_EXIF_0_5_4 -/* Define to 1 if you have the `feof_unlocked' function. */ -#undef HAVE_FEOF_UNLOCKED +/* whether we use a version of libexif equal or greater than 0.6.9 */ +#undef HAVE_EXIF_0_6_9 -/* Define to 1 if you have the `fgets_unlocked' function. */ -#undef HAVE_FGETS_UNLOCKED +/* 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 to 1 if you have the `getc_unlocked' function. */ -#undef HAVE_GETC_UNLOCKED - /* Define to 1 if you have the `getegid' function. */ #undef HAVE_GETEGID @@ -77,6 +97,9 @@ /* Define if you have the iconv() function. */ #undef HAVE_ICONV +/* Define if you have the 'intmax_t' type in or . */ +#undef HAVE_INTMAX_T + /* Define if exists and doesn't clash with . */ #undef HAVE_INTTYPES_H @@ -102,6 +125,12 @@ /* 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 @@ -123,6 +152,9 @@ /* whether we use popt */ #undef HAVE_POPT +/* Define if your printf() function supports format strings with positions. */ +#undef HAVE_POSIX_PRINTF + /* Define if we use pthread.h. */ #undef HAVE_PTHREAD @@ -138,6 +170,9 @@ /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + /* Define to 1 if you have the header file. */ #undef HAVE_STDDEF_H @@ -187,9 +222,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the unsigned long long type. */ +/* Define if you have the 'unsigned long long' type. */ #undef HAVE_UNSIGNED_LONG_LONG +/* 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 + /* Define to 1 if you have the `__argz_count' function. */ #undef HAVE___ARGZ_COUNT @@ -229,12 +273,16 @@ /* Define if exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN +/* 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 */ + 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. */ @@ -246,13 +294,22 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus #undef inline +#endif /* Define to `long' if does not define. */ #undef off_t +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ +#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 diff -Naur gphoto2-2.1.4/config.rpath gphoto2/config.rpath --- gphoto2-2.1.4/config.rpath 2003-10-08 17:30:57.000000000 +0200 +++ gphoto2/config.rpath 2004-10-18 16:09:15.426074931 +0200 @@ -143,7 +143,7 @@ ld_shlibs=no ;; beos*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no @@ -162,9 +162,9 @@ netbsd*) ;; solaris* | sysv5*) - if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no @@ -174,7 +174,7 @@ hardcode_direct=yes ;; *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else ld_shlibs=no diff -Naur gphoto2-2.1.4/config.sub gphoto2/config.sub --- gphoto2-2.1.4/config.sub 2003-10-08 17:21:39.000000000 +0200 +++ gphoto2/config.sub 2004-10-18 16:10:25.413999691 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-08-18' +timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +145,7 @@ -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) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -236,7 +237,7 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -261,7 +262,7 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -299,7 +300,7 @@ | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -307,7 +308,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -325,8 +326,9 @@ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -335,7 +337,7 @@ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -362,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -379,6 +384,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -438,12 +446,24 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -644,10 +664,6 @@ 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 @@ -728,10 +744,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -743,6 +755,10 @@ basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -963,6 +979,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1036,6 +1056,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1058,7 +1081,7 @@ sh64) basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1131,19 +1154,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1182,6 +1206,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1203,6 +1230,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1225,6 +1255,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1341,6 +1374,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1473,9 +1509,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; diff -Naur gphoto2-2.1.4/configure gphoto2/configure --- gphoto2-2.1.4/configure 2004-01-18 21:01:28.000000000 +0100 +++ gphoto2/configure 2004-10-18 16:10:55.887177463 +0200 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,16 +218,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -308,7 +309,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB PKG_CONFIG GP_CFLAGS GP_LIBS PTHREAD_LIBS HAVE_CDK_TRUE HAVE_CDK_FALSE CDK_CFLAGS CDK_LIBS HAVE_JPEG_TRUE HAVE_JPEG_FALSE JPEG_LIBS JPEG_CFLAGS HAVE_EXIF_TRUE HAVE_EXIF_FALSE EXIF_CFLAGS EXIF_LIBS AALIB_CONFIG HAVE_AA_TRUE HAVE_AA_FALSE AA_LIBS AA_CFLAGS HAVE_POPT_TRUE HAVE_POPT_FALSE POPT_LIBS POPT_CFLAGS HAVE_RL_TRUE HAVE_RL_FALSE RL_LIBS RL_CFLAGS 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 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 CPP MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB 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 PKG_CONFIG GP_CFLAGS GP_LIBS PTHREAD_LIBS HAVE_CDK_TRUE HAVE_CDK_FALSE CDK_CFLAGS CDK_LIBS HAVE_JPEG_TRUE HAVE_JPEG_FALSE JPEG_LIBS JPEG_CFLAGS HAVE_EXIF_TRUE HAVE_EXIF_FALSE EXIF_CFLAGS EXIF_LIBS AALIB_CONFIG HAVE_AA_TRUE HAVE_AA_FALSE AA_LIBS AA_CFLAGS HAVE_POPT_TRUE HAVE_POPT_FALSE POPT_LIBS POPT_CFLAGS HAVE_RL_TRUE HAVE_RL_FALSE RL_LIBS RL_CFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -667,7 +668,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -707,10 +708,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -802,9 +803,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -848,10 +849,10 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -921,12 +922,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -937,7 +971,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -951,8 +985,7 @@ if $ac_init_version; then cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -964,7 +997,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1041,19 +1074,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1087,12 +1120,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1121,7 +1154,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1140,7 +1173,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1220,7 +1253,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1237,13 +1270,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1293,7 +1326,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version="1.7" +am__api_version="1.9" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1330,6 +1363,7 @@ # 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 @@ -1346,6 +1380,7 @@ 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. @@ -1353,20 +1388,20 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1454,7 +1489,6 @@ 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` @@ -1468,6 +1502,39 @@ 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 + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + 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. @@ -1510,7 +1577,7 @@ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1546,7 +1613,7 @@ fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# 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 @@ -1566,7 +1633,7 @@ # Define the identity of the package. PACKAGE=gphoto2 - VERSION=2.1.4 + VERSION=2.1.4head cat >>confdefs.h <<_ACEOF @@ -1594,9 +1661,6 @@ 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 @@ -1689,6 +1753,13 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -1717,6 +1788,7 @@ + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2053,7 +2125,6 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2073,8 +2144,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -2094,23 +2165,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -2184,8 +2255,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2210,7 +2281,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2261,7 +2331,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2281,11 +2350,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2298,7 +2377,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2314,7 +2393,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2331,11 +2409,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2348,7 +2436,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2375,7 +2463,6 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2403,6 +2490,16 @@ 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);}; @@ -2429,11 +2526,21 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2446,7 +2553,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2474,19 +2581,28 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2494,14 +2610,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2512,11 +2627,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2529,9 +2654,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2548,11 +2672,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2564,7 +2698,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2578,7 +2712,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2691,7 +2825,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # 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 @@ -2719,9 +2855,14 @@ 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 - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # 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 @@ -2780,7 +2921,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2791,7 +2931,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2803,6 +2943,7 @@ (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 @@ -2823,7 +2964,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2841,6 +2981,7 @@ (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 @@ -2887,7 +3028,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2898,7 +3038,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2910,6 +3050,7 @@ (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 @@ -2930,7 +3071,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2948,6 +3088,7 @@ (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 @@ -2997,6 +3138,7 @@ # 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 @@ -3013,6 +3155,7 @@ 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. @@ -3020,20 +3163,20 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -3070,7 +3213,8 @@ _ACEOF -ALL_LINGUAS="cs da de es fr it ja no pt_BR ro ru sk sl sv uk zh_CN" + +ALL_LINGUAS="az cs da de en_GB es fi fr hu it ja nl no pt_BR ro ru sk sl sr sv uk zh_CN" # EVIL HACKS echo "$as_me:$LINENO: checking for po/Makevars requiring evil hack" >&5 echo $ECHO_N "checking for po/Makevars requiring evil hack... $ECHO_C" >&6 @@ -3527,16 +3671,14 @@ fi - - echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then +echo "$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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3560,33 +3702,100 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_cposix_strerror=yes + ac_cv_search_strerror="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cposix_strerror=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +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 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_search_strerror="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 -if test $ac_cv_lib_cposix_strerror = yes; then - LIBS="$LIBS -lcposix" +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done fi +LIBS=$ac_func_search_save_LIBS +fi +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 echo "$as_me:$LINENO: checking for egrep" >&5 @@ -3610,7 +3819,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3631,11 +3839,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3648,12 +3866,11 @@ ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3675,7 +3892,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3700,7 +3916,6 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3712,9 +3927,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3725,7 +3940,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -3750,7 +3965,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3770,7 +3985,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3833,11 +4047,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3850,7 +4074,7 @@ ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 @@ -3862,6 +4086,68 @@ fi + + echo "$as_me:$LINENO: checking for signed" >&5 +echo $ECHO_N "checking for signed... $ECHO_C" >&6 +if test "${bh_cv_c_signed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +signed char x; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + bh_cv_c_signed=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +bh_cv_c_signed=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5 +echo "${ECHO_T}$bh_cv_c_signed" >&6 + if test $bh_cv_c_signed = no; then + +cat >>confdefs.h <<\_ACEOF +#define signed +_ACEOF + + fi + echo "$as_me:$LINENO: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then @@ -3870,7 +4156,6 @@ ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3885,11 +4170,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3901,23 +4196,27 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done 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) ;; - no) -cat >>confdefs.h <<\_ACEOF -#define inline -_ACEOF - ;; - *) cat >>confdefs.h <<_ACEOF -#define inline $ac_cv_c_inline + *) + 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. @@ -3931,7 +4230,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -3940,7 +4239,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3952,11 +4250,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3969,7 +4277,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -3989,7 +4297,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4009,11 +4316,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4026,7 +4343,7 @@ ac_cv_type_off_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 @@ -4046,7 +4363,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4066,11 +4382,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4083,7 +4409,7 @@ ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 @@ -4097,696 +4423,2177 @@ fi -# 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 "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +long long ll = 1LL; int i = 63; int main () { -char *p = (char *) alloca (2 * sizeof (int)); +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>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_working_alloca_h=yes + ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no +ac_cv_type_long_long=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then +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_ALLOCA_H 1 +#define HAVE_LONG_LONG 1 _ACEOF -fi + 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 "$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 - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + 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. */ -#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 + + /* 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 () { -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>&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 -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_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_alloca_works=yes + gt_cv_c_long_double=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no +gt_cv_c_long_double=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi 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 +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_ALLOCA 1 +#define HAVE_LONG_DOUBLE 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 + fi -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 "$as_me:$LINENO: checking for wchar_t" >&5 +echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 +if test "${gt_cv_c_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif +#include + wchar_t foo = (wchar_t)'\0'; +int +main () +{ + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes +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 - ac_cv_os_cray=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +gt_cv_c_wchar_t=no 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 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 +echo "${ECHO_T}$gt_cv_c_wchar_t" >&6 + if test $gt_cv_c_wchar_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WCHAR_T 1 +_ACEOF + + fi + + + echo "$as_me:$LINENO: checking for wint_t" >&5 +echo $ECHO_N "checking for wint_t... $ECHO_C" >&6 +if test "${gt_cv_c_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* 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 - +#include + wint_t foo = (wchar_t)'\0'; 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>&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 -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_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" + gt_cv_c_wint_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +gt_cv_c_wint_t=no fi -rm -f 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 +echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 +echo "${ECHO_T}$gt_cv_c_wint_t" >&6 + if test $gt_cv_c_wint_t = yes; then -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func +cat >>confdefs.h <<\_ACEOF +#define HAVE_WINT_T 1 _ACEOF - break -fi + 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 "$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 - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -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; -} - +#include +#include int main () { - exit (find_stack_direction () < 0); +uintmax_t i = (uintmax_t) -1; + ; + 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_c_stack_direction=1 + jm_ac_cv_header_inttypes_h=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_stack_direction=-1 -fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +jm_ac_cv_header_inttypes_h=no fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 +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 STACK_DIRECTION $ac_cv_c_stack_direction +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 _ACEOF - -fi + 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 "$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 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + 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> +#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>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + jm_ac_cv_header_stdint_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +jm_ac_cv_header_stdint_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +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 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H_WITH_UINTMAX 1 +_ACEOF + + fi + + + + + echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6 +if test "${gt_cv_c_intmax_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> + +#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 -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 - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gt_cv_c_intmax_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +gt_cv_c_intmax_t=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 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 +echo "${ECHO_T}$gt_cv_c_intmax_t" >&6 + if test $gt_cv_c_intmax_t = yes; then -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_INTMAX_T 1 +_ACEOF + + fi + + + + echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5 +echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6 +if test "${gt_cv_func_printf_posix+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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 + 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. */ -fi +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif -done +_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* -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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* 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 () +#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 () { -return f != $ac_func; - ; - return 0; + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +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_exeext' + (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 - eval "$as_ac_var=yes" + gt_cv_func_printf_posix=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 -eval "$as_ac_var=no" +( exit $ac_status ) +gt_cv_func_printf_posix=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext 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 -_ACEOF fi -done +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) -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 +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 - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -/* 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 +#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 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 + + +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) */ + 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 -#include -#include + 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 -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + echo "$as_me:$LINENO: checking for SIZE_MAX" >&5 +echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6 + result= + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it #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 +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Found it" >/dev/null 2>&1; then + result=yes +fi +rm -f conftest* -# 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 */ + 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 -#endif /* no HAVE_GETPAGESIZE */ +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 () { - char *data, *data2, *data3; - int i, pagesize; - int fd; +static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)]; +test_array [0] = 0 - pagesize = getpagesize (); + ; + 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 - /* 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); +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: 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. */ +#include +long longval () { return ~(size_t)0 / 10; } +unsigned long ulongval () { return ~(size_t)0 / 10; } +#include +#include +int +main () +{ - /* 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 - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) + FILE *f = fopen ("conftest.val", "w"); + if (! f) exit (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - 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); - /* 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); + ; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -4800,131 +6607,322 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes + 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 ) -ac_cv_func_mmap_fixed_mapped=no +result=? fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then +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 -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP 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 + 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.mmap +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 - 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 +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 -#line $LINENO "configure" /* 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 -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - + ; + return 0; +} _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 +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 - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo=`expr '(' $ac_mid ')' + 1` 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 +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 - - # 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 - + 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 -#line $LINENO "configure" /* 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 -#include - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif +int +main () { - /* 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 + 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); - z = x / y; - nan = y / y; - exit (1); + ; + return 0; } - _ACEOF rm -f conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -4937,230 +6935,358 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_int_divbyzero_sigfpe=yes + 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 ) -gt_cv_int_divbyzero_sigfpe=no +result=? fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -echo "$as_me:$LINENO: result: $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 +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 - - - echo "$as_me:$LINENO: checking for inttypes.h" >&5 -echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6 -if test "${jm_ac_cv_header_inttypes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ; + 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 -#include +#include int main () { -uintmax_t i = (uintmax_t) -1; +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>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - jm_ac_cv_header_inttypes_h=yes + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -jm_ac_cv_header_inttypes_h=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext +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: 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 +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 >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 +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 - fi + ; + 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 - 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 +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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +#include int main () { -uintmax_t i = (uintmax_t) -1; +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>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - jm_ac_cv_header_stdint_h=yes + ac_hi=$ac_mid 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.$ac_objext conftest.$ac_ext +ac_lo=`expr '(' $ac_mid ')' + 1` fi -echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5 -echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6 - if test $jm_ac_cv_header_stdint_h = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H_WITH_UINTMAX 1 -_ACEOF - - fi - - - echo "$as_me:$LINENO: checking for 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 +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: 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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -unsigned long long ull = 1; int i = 63; +#include +long longval () { return sizeof (size_t) <= sizeof (unsigned int); } +unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); } +#include +#include int main () { -unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull; + + 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_objext conftest$ac_exeext +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_exeext' + (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_type_unsigned_long_long=yes + fits_in_uint=`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_type_unsigned_long_long=no +( exit $ac_status ) +result=? fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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_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 -#line $LINENO "configure" +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 -#include +#include + extern size_t foo; + extern unsigned long foo; + int main () { @@ -5171,97 +7297,206 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_header_inttypes_h=yes + fits_in_uint=0 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_header_inttypes_h=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi -echo "$as_me:$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 +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 HAVE_INTTYPES_H 1 +#define SIZE_MAX $result _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 + +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 - - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + # 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. */ -#include -#ifdef PRId32 -char *p = PRId32; -#endif - -int -main () -{ - - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gt_cv_inttypes_pri_broken=no + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gt_cv_inttypes_pri_broken=yes +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" fi -rm -f 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 `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF 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 +done - fi if test "X$prefix" = "XNONE"; then @@ -5351,11 +7586,12 @@ # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac fi done IFS="$ac_save_ifs" @@ -5381,11 +7617,12 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi +case `$LD -v 2>&1 &5 echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 @@ -5812,261 +8049,730 @@ + 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 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 + + + + + + + + + + + + + + + + + + + + + + + + +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 -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 "$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 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + 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> +#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>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_have_decl__snprintf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_have_decl__snprintf=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +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 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +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 <$ac_header> +#include +int +main () +{ + +#ifndef _snwprintf + char *p = (char *) _snwprintf; +#endif + + ; + 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 - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (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_header_preproc=no +ac_cv_have_decl__snwprintf=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" +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 +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 -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 HAVE_DECL__SNWPRINTF $gt_value _ACEOF -fi - -done - - - - - - + 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 () +{ +#ifndef feof_unlocked + char *p = (char *) feof_unlocked; +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_feof_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_have_decl_feof_unlocked=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6 + if test $ac_cv_have_decl_feof_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FEOF_UNLOCKED $gt_value +_ACEOF + echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5 +echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +#ifndef fgets_unlocked + char *p = (char *) fgets_unlocked; +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_fgets_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_have_decl_fgets_unlocked=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6 + if test $ac_cv_have_decl_fgets_unlocked = yes; then + gt_value=1 + else + gt_value=0 + fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FGETS_UNLOCKED $gt_value +_ACEOF -for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ -__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 "$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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* 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 - +#include int main () { -return f != $ac_func; + +#ifndef getc_unlocked + char *p = (char *) getc_unlocked; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +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 -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_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_have_decl_getc_unlocked=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_have_decl_getc_unlocked=no fi -rm -f 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_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 -fi -done + + + 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 @@ -6108,7 +8814,6 @@ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6128,11 +8833,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6144,12 +8859,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6169,11 +8884,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6186,7 +8911,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi @@ -6221,7 +8947,6 @@ else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6250,11 +8975,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6267,7 +9002,7 @@ am_cv_proto_iconv_arg1="const" fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -6290,7 +9025,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6307,11 +9041,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6324,7 +9068,8 @@ am_cv_langinfo_codeset=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5 @@ -6345,7 +9090,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6362,11 +9106,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6379,7 +9133,8 @@ am_cv_val_LC_MESSAGES=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 @@ -6519,7 +9274,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6539,11 +9293,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6556,7 +9320,8 @@ gt_cv_func_gnugettext1_libc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 @@ -6951,7 +9716,6 @@ gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6975,11 +9739,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6992,11 +9766,11 @@ gt_cv_func_gnugettext1_libintl=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7020,11 +9794,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7039,7 +9823,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" @@ -7198,6 +9983,7 @@ + succeeded=no if test -z "$PKG_CONFIG"; then @@ -7304,7 +10090,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgphoto2 $GP_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7328,11 +10113,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7345,7 +10140,8 @@ ac_cv_lib_gphoto2_gp_library_version=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_gphoto2_gp_library_version" >&5 @@ -7375,7 +10171,6 @@ echo "${ECHO_T}version $libgphoto2_version from $libgphoto2_prefix" >&6 - pthread_msg=no try_pthread=true @@ -7400,7 +10195,6 @@ echo "$as_me:$LINENO: checking pthread.h usability" >&5 echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7411,11 +10205,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7428,7 +10232,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -7436,7 +10240,6 @@ echo "$as_me:$LINENO: checking pthread.h presence" >&5 echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7454,6 +10257,7 @@ (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 @@ -7473,33 +10277,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -7526,7 +10329,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7550,11 +10352,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7567,7 +10379,8 @@ ac_cv_lib_pthread_pthread_exit=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_exit" >&5 @@ -7591,7 +10404,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7615,11 +10427,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7632,7 +10454,8 @@ ac_cv_lib_c_r_pthread_create=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 @@ -7659,11 +10482,13 @@ fi + if test "$ac_cv_c_compiler_gnu" = "yes"; then CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes" LDFLAGS="$LDFLAGS -g -Wall" fi + cdk_msg="no (http://dickey.his.com/cdk/cdk.html)" try_cdk=true have_cdk=false @@ -7701,7 +10526,6 @@ echo "$as_me:$LINENO: checking cdk/cdk.h usability" >&5 echo $ECHO_N "checking cdk/cdk.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7712,11 +10536,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7729,7 +10563,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -7737,7 +10571,6 @@ echo "$as_me:$LINENO: checking cdk/cdk.h presence" >&5 echo $ECHO_N "checking cdk/cdk.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7755,6 +10588,7 @@ (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 @@ -7774,33 +10608,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: cdk/cdk.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: cdk/cdk.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: cdk/cdk.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: cdk/cdk.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: cdk/cdk.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: cdk/cdk.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: cdk/cdk.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: cdk/cdk.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: cdk/cdk.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: cdk/cdk.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cdk/cdk.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -7837,7 +10670,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcdk $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7861,11 +10693,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7878,7 +10720,8 @@ ac_cv_lib_cdk_newCDKFScale=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_cdk_newCDKFScale" >&5 @@ -7916,6 +10759,7 @@ + jpeg_msg=no try_jpeg=true have_jpeg=false @@ -7953,7 +10797,6 @@ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7964,11 +10807,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7981,7 +10834,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -7989,7 +10842,6 @@ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8007,6 +10859,7 @@ (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 @@ -8026,33 +10879,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8079,7 +10931,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8103,11 +10954,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8120,7 +10981,8 @@ ac_cv_lib_jpeg_jpeg_read_scanlines=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_scanlines" >&5 @@ -8149,7 +11011,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8173,11 +11034,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8190,7 +11061,8 @@ ac_cv_lib_jpeg_jpeg_stdio_src=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_stdio_src" >&5 @@ -8234,6 +11106,7 @@ + pkgconfig_msg="no (http://www.freedesktop.org/software/pkgconfig)" try_pkgconfig=true have_pkgconfig=false @@ -8293,6 +11166,7 @@ fi fi + exif_msg="no (http://www.sourceforge.net/projects/libexif)" try_exif=true have_exif=false @@ -8353,7 +11227,6 @@ echo "$as_me:$LINENO: checking exif-data.h usability" >&5 echo $ECHO_N "checking exif-data.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8364,11 +11237,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8381,7 +11264,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8389,7 +11272,6 @@ echo "$as_me:$LINENO: checking exif-data.h presence" >&5 echo $ECHO_N "checking exif-data.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8407,6 +11289,7 @@ (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 @@ -8426,33 +11309,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: exif-data.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: exif-data.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: exif-data.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: exif-data.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: exif-data.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: exif-data.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: exif-data.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: exif-data.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: exif-data.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: exif-data.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-data.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: exif-data.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-data.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: exif-data.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-data.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: exif-data.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: exif-data.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: exif-data.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-data.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: exif-data.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8487,6 +11369,154 @@ if $have_exif; then CPPFLAGS_save="$CPPFLAGS" CPPFLAGS=$EXIF_CFLAGS + if test "${ac_cv_header_exif_log_h+set}" = set; then + echo "$as_me:$LINENO: checking for exif-log.h" >&5 +echo $ECHO_N "checking for exif-log.h... $ECHO_C" >&6 +if test "${ac_cv_header_exif_log_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_exif_log_h" >&5 +echo "${ECHO_T}$ac_cv_header_exif_log_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking exif-log.h usability" >&5 +echo $ECHO_N "checking exif-log.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 exif-log.h presence" >&5 +echo $ECHO_N "checking exif-log.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_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: exif-log.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: exif-log.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: exif-log.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: exif-log.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: exif-log.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: exif-log.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: exif-log.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: exif-log.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: exif-log.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-log.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: exif-log.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for exif-log.h" >&5 +echo $ECHO_N "checking for exif-log.h... $ECHO_C" >&6 +if test "${ac_cv_header_exif_log_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_exif_log_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_exif_log_h" >&5 +echo "${ECHO_T}$ac_cv_header_exif_log_h" >&6 + +fi +if test $ac_cv_header_exif_log_h = yes; then + + exif_msg="${exif_msg}, (>= 0.6.9)" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXIF_0_6_9 1 +_ACEOF + +fi + + if test "${ac_cv_header_exif_ifd_h+set}" = set; then echo "$as_me:$LINENO: checking for exif-ifd.h" >&5 echo $ECHO_N "checking for exif-ifd.h... $ECHO_C" >&6 @@ -8500,7 +11530,6 @@ echo "$as_me:$LINENO: checking exif-ifd.h usability" >&5 echo $ECHO_N "checking exif-ifd.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8511,11 +11540,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8528,7 +11567,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8536,7 +11575,6 @@ echo "$as_me:$LINENO: checking exif-ifd.h presence" >&5 echo $ECHO_N "checking exif-ifd.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8554,6 +11592,7 @@ (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 @@ -8573,33 +11612,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: exif-ifd.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: exif-ifd.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: exif-ifd.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: exif-ifd.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: exif-ifd.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: exif-ifd.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: exif-ifd.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: exif-ifd.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: exif-ifd.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: exif-ifd.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-ifd.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: exif-ifd.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-ifd.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: exif-ifd.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-ifd.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: exif-ifd.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: exif-ifd.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: exif-ifd.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: exif-ifd.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: exif-ifd.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8643,6 +11681,7 @@ + aa_msg="no (http://www.sourceforge.net/projects/aa-project)" try_aa=true have_aa=false @@ -8669,7 +11708,6 @@ echo "$as_me:$LINENO: checking aalib.h usability" >&5 echo $ECHO_N "checking aalib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8680,11 +11718,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8697,7 +11745,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8705,7 +11753,6 @@ echo "$as_me:$LINENO: checking aalib.h presence" >&5 echo $ECHO_N "checking aalib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8723,6 +11770,7 @@ (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 @@ -8742,33 +11790,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: aalib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: aalib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: aalib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: aalib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: aalib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: aalib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: aalib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: aalib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: aalib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: aalib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: aalib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: aalib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: aalib.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: aalib.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: aalib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: aalib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: aalib.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8858,6 +11905,7 @@ + popt_msg="no (Note that popt will be mandatory in the future!)" try_popt=true have_popt=false @@ -8885,7 +11933,6 @@ echo "$as_me:$LINENO: checking popt.h usability" >&5 echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8896,11 +11943,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8913,7 +11970,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -8921,7 +11978,6 @@ echo "$as_me:$LINENO: checking popt.h presence" >&5 echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8939,6 +11995,7 @@ (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 @@ -8958,33 +12015,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: popt.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: popt.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: popt.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: popt.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: popt.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -9031,6 +12087,7 @@ + rl_msg="no (http://cnswww.cns.cwru.edu/~chet/readline/rltop.html)" try_readline=true have_readline=false @@ -9058,7 +12115,6 @@ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9069,11 +12125,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9086,7 +12152,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -9094,7 +12160,6 @@ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9112,6 +12177,7 @@ (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 @@ -9131,33 +12197,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -9184,7 +12249,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9208,11 +12272,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9225,7 +12299,8 @@ ac_cv_lib_readline_rl_completion_append_character=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_append_character" >&5 @@ -9240,7 +12315,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9264,11 +12338,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9281,7 +12365,8 @@ ac_cv_lib_readline_rl_completion_matches=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 @@ -9315,7 +12400,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9339,11 +12423,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9356,7 +12450,8 @@ ac_cv_lib_readline_rl_completion_matches=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 @@ -9428,13 +12523,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -9464,13 +12559,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -9481,7 +12576,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -9588,9 +12683,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -9609,7 +12705,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -9788,16 +12884,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -9824,7 +12921,7 @@ cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9868,9 +12965,9 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -9887,11 +12984,10 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -9988,7 +13084,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # 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. @@ -10112,14 +13208,17 @@ 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,@AMTAR@,$AMTAR,;t t +s,@am__tar@,$am__tar,;t t +s,@am__untar@,$am__untar,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t @@ -10159,6 +13258,10 @@ 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 @@ -10234,9 +13337,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -10254,21 +13357,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10284,10 +13387,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10325,12 +13428,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac case $INSTALL in @@ -10352,7 +13488,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -10361,24 +13497,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -10420,12 +13556,12 @@ # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -10434,11 +13570,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -10452,28 +13588,29 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -10496,9 +13633,9 @@ s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -10512,13 +13649,13 @@ # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -10527,7 +13664,7 @@ # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -10554,7 +13691,7 @@ # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -10588,10 +13725,10 @@ else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10607,10 +13744,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10642,10 +13779,10 @@ 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 || + 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; } @@ -10664,16 +13801,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. if test "$ac_dir" != .; then @@ -10699,12 +13861,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -10722,10 +13917,10 @@ 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 || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10735,36 +13930,30 @@ else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. 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 " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/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 || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10780,10 +13969,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -10826,7 +14015,7 @@ 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, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # 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 @@ -10842,19 +14031,27 @@ # The set of available languages was given in configure.in. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; esac POFILES= - GMOFILES= UPDATEPOFILES= DUMMYPOFILES= + GMOFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. @@ -10889,7 +14086,7 @@ done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in @@ -10936,12 +14133,12 @@ fi -echo " +cat< to complete dnl commands in the gphoto2 shell or to use or to @@ -346,7 +359,7 @@ AC_SUBST(RL_LIBS) AC_SUBST(RL_CFLAGS) -AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile +AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile Makefile gphoto2/Makefile doc/Makefile @@ -355,12 +368,12 @@ packaging/rpm/package.spec ]) -echo " +cat<. +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'. + DEPDIR directory where to store dependencies. + 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 +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -262,26 +287,35 @@ 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. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$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" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" @@ -477,3 +511,12 @@ 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 -Naur gphoto2-2.1.4/doc/gphoto2.1 gphoto2/doc/gphoto2.1 --- gphoto2-2.1.4/doc/gphoto2.1 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/doc/gphoto2.1 2004-09-12 21:05:53.000000000 +0200 @@ -17,31 +17,16 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "GPHOTO2" 1 "February 2002" "" "" +.TH "GPHOTO2" 1 "September 2004" "" "" .SH NAME gphoto2 \- command-line gphoto2 client .SH "SYNOPSIS" - -.nf -\fBgphoto2\fR [\-\-debug] [\fB\-q\fR | \fB\-\-quiet\fR] [\fB\-v\fR | \fB\-\-verbose\fR] [\fB\-h\fR | \fB\-\-help\fR] - [\-\-list\-cameras] [\-\-list\-ports] [\-\-stdout] - [\-\-stdout\-size] [\-\-auto\-detect] [\-\-port \fIPATH\fR] - [\-\-speed \fISPEED\fR] [\-\-camera \fIMODEL\fR] [\-\-filename \fIFILENAME\fR] - [\-\-usbid \fIUSBIDS\fR] [\fB\-a\fR | \fB\-\-abilities\fR] [\-\-folder \fIFOLDER\fR] - [[\fB\-R\fR | \fB\-\-recurse\fR] | \fB\-\-norecurse\fR] [\fB\-l\fR | \fB\-\-list\-folders\fR] - [\fB\-L\fR | \fB\-\-list\-files\fR] [\fB\-m \fINAME\fR\fR | \fB\-\-mkdir \fINAME\fR\fR] - [\fB\-r \fINAME\fR\fR | \fB\-\-rmdir \fINAME\fR\fR] [\fB\-n\fR | \fB\-\-num\-files\fR] - [\fB\-p \fIRANGE\fR\fR | \fB\-\-get\-file \fIRANGE\fR\fR] [\fB\-P\fR | \fB\-\-get\-all\-files\fR] - [\fB\-t \fIRANGE\fR\fR | \fB\-\-get\-thumbnail \fIRANGE\fR\fR] - [\fB\-T\fR | \fB\-\-get\-all\-thumbnails\fR] - [\fB\-r \fIRANGE\fR\fR | \fB\-\-get\-raw\-data \fIRANGE\fR\fR] [\-\-get\-all\-raw\-data] - [\-\-get\-audio\-data \fIRANGE\fR] [\-\-get\-all\-audio\-data] - [\fB\-d \fIRANGE\fR\fR | \fB\-\-delete\-file \fIRANGE\fR\fR] [\fB\-D\fR | \fB\-\-delete\-all\-files\fR] - [\fB\-u \fIFILENAME\fR\fR | \fB\-\-upload\-file \fIFILENAME\fR\fR] [\-\-capture\-preview] - [\-\-capture\-image] [\-\-capture\-movie] [\-\-capture\-sound] - [\-\-capture\-show\-info \fIRANGE\fR] - [\-\-summary] [\-\-manual] [\-\-about] [\-\-shell] -.fi +.ad l +.hy 0 +.HP 8 +\fBgphoto2\fR [\-\-debug] [\fB\-q\fR | \fB\-\-quiet\fR] [\fB\-v\fR | \fB\-\-verbose\fR] [\fB\-h\fR | \fB\-\-help\fR] [\-\-list\-cameras] [\-\-list\-ports] [\-\-stdout] [\-\-stdout\-size] [\-\-auto\-detect] [\-\-port\ \fIPATH\fR] [\-\-speed\ \fISPEED\fR] [\-\-camera\ \fIMODEL\fR] [\-\-filename\ \fIFILENAME\fR] [\-\-usbid\ \fIUSBIDS\fR] [\fB\-a\fR | \fB\-\-abilities\fR] [\-\-folder\ \fIFOLDER\fR] [[\fB\-R\fR | \fB\-\-recurse\fR] | \fB\-\-norecurse\fR] [\fB\-l\fR | \fB\-\-list\-folders\fR] [\fB\-L\fR | \fB\-\-list\-files\fR] [\fB\-m\ \fINAME\fR\fR | \fB\-\-mkdir\ \fINAME\fR\fR] [\fB\-r\ \fINAME\fR\fR | \fB\-\-rmdir\ \fINAME\fR\fR] [\fB\-n\fR | \fB\-\-num\-files\fR] [\fB\-p\ \fIRANGE\fR\fR | \fB\-\-get\-file\ \fIRANGE\fR\fR] [\fB\-P\fR | \fB\-\-get\-all\-files\fR] [\fB\-t\ \fIRANGE\fR\fR | \fB\-\-get\-thumbnail\ \fIRANGE\fR\fR] [\fB\-T\fR | \fB\-\-get\-all\-thumbnails\fR] [\fB\-r\ \fIRANGE\fR\fR | \fB\-\-get\-raw\-data\ \fIRANGE\fR\fR] [\-\-get\-all\-raw\-data] [\-\-get\-audio\-data\ \fIRANGE\fR] [\-\-get\-all\-audio\-data] [\fB\-d\ \fIRANGE\fR\fR | \fB\-\-delete\-file\ \fIRANGE\fR\fR] [\fB\-D\fR | \fB\-\-delete\-all\-files\fR] [\fB\-u\ \fIFILENAME\fR\fR | \fB\-\-upload\-file\ \fIFILENAME\fR\fR] [\-\-capture\-preview] [\-\-capture\-image] [\-\-capture\-movie] [\-\-capture\-sound] [\-\-capture\-show\-info\ \fIRANGE\fR] [\-\-summary] [\-\-manual] [\-\-about] [\-\-shell] +.ad +.hy .SH "DESCRIPTION" @@ -85,11 +70,11 @@ .TP \fB\-\-auto\-detect\fR -List auto\-detected cameras\&. +List auto\-detected cameras and the ports to which they are connected\&. .TP \fB\-\-port\fR \fIPATH\fR -Specify port device\&. The\fB\-\-list\-ports\fR prints a list of valid, usable ports\&. +Specify port device\&. The\fB\-\-list\-ports\fR prints a list of valid, usable ports\&. In case of multiple USB cameras, the\fB\-\-auto\-detect\fR shows you the specific port each camera is connected to\&. .TP \fB\-\-speed\fR \fISPEED\fR @@ -108,8 +93,8 @@ Specify the filename to use when saving downloaded files\&. The \fB\-\-filename\fR option accepts %a, %A, %b, %B, %d, %H, %k, %I, %l, %j, %m, %M, %S, %y, %%, (see date(1)) and, in addition, %n for the number, %C for the filename suffix, and %f for the filename without suffix\&. .TP -\fB\-\-usbid\fR \fIUSBIDS\fR -(Expert only) Override USB IDs\&.\fIUSBIDS\fR must be of the form \fIDetectedVendorID\fR:\fIDetectedProductID\fR=\fITreatAsVendorID\fR:\fITreatAsProductID\fR to treat any USB device detected as \fIDetectedVendorID\fR:\fIDetectedProductID\fR as \fITreatAsVendorID\fR:\fITreatAsProductID\fR instead\&. All the VendorIDs and ProductIDs should be hexadecimal numbers beginning in C notation, i\&.e\&. beginning with '0x'\&. +\fB\-\-usbid\fR \fI\fIUSBIDS\fR\fR +(Expert only) Override USB IDs\&.\fI\fIUSBIDS\fR\fR must be of the form\fI\fIDetectedVendorID\fR:\fIDetectedProductID\fR=\fITreatAsVendorID\fR:\fITreatAsProductID\fR\fR to treat any USB device detected as\fI\fIDetectedVendorID\fR:\fIDetectedProductID\fR\fR as\fI\fITreatAsVendorID\fR:\fITreatAsProductID\fR\fR instead\&. All the VendorIDs and ProductIDs should be hexadecimal numbers beginning in C notation, i\&.e\&. beginning with '0x'\&. Example: \fI\-\-usbid \fI0x4a9:0x306b=0x4a9:0x306c\fR\fR @@ -214,6 +199,14 @@ Show info\&. .TP +\fB\-\-list\-config\fR +List all configuration entries\&. + +.TP +\fB\-\-get\-config\fR \fICONFIGENTRY\fR +Get the specified configuration entry\&. + +.TP \fB\-\-summary\fR Summary of camera status\&. @@ -281,7 +274,7 @@ .SH "SEE ALSO" .PP - \fBlibgphoto2\fR(3), The gPhoto2 Manual, \fIhttp://www.gphoto.org/\fR + \fBlibgphoto2\fR(3), The gPhoto2 Manual, http://www\&.gphoto\&.org/: \fIhttp://www.gphoto.org/\fR .SH "EXAMPLES" @@ -304,4 +297,4 @@ .SH AUTHOR The gPhoto2 Team. .br -Man page edited by Tim Waugh . +Man page edited by Tim Waugh[ twaugh at redhat dot com ]. diff -Naur gphoto2-2.1.4/doc/Makefile.in gphoto2/doc/Makefile.in --- gphoto2-2.1.4/doc/Makefile.in 2004-01-18 21:01:24.000000000 +0100 +++ gphoto2/doc/Makefile.in 2004-10-18 16:10:24.825092883 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ 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 @@ -35,7 +33,38 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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)" +NROFF = nroff +MANS = $(man_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -75,6 +104,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -83,8 +113,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,6 +175,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -162,6 +197,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -170,32 +206,43 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = gphoto2.1 - EXTRA_DIST = gphoto2.1 -subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -NROFF = nroff -MANS = $(man_MANS) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: - -man1dir = $(mandir)/man1 install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man1dir) + 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 \ @@ -214,8 +261,8 @@ 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; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -235,8 +282,8 @@ 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; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done tags: TAGS TAGS: @@ -244,10 +291,6 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -261,7 +304,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -279,9 +322,10 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(man1dir) + for dir in "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -293,7 +337,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -301,7 +345,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -318,6 +362,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -353,8 +399,8 @@ uninstall-man: uninstall-man1 .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + 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-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ diff -Naur gphoto2-2.1.4/gphoto2/actions.c gphoto2/gphoto2/actions.c --- gphoto2-2.1.4/gphoto2/actions.c 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/actions.c 2004-09-12 20:00:33.000000000 +0200 @@ -351,7 +351,13 @@ e = content->entries[i]; printf ("%-20.20s", exif_tag_get_name (e->tag)); printf ("|"); +#ifdef HAVE_EXIF_0_6_9 + {char b[1024]; + printf ("%-59.59s", exif_entry_get_value (e, b, sizeof (b))); + } +#else printf ("%-59.59s", exif_entry_get_value (e)); +#endif printf ("\n"); } } @@ -786,7 +792,7 @@ int n; printf (_("gphoto2 %s\n" "\n" - "Copyright (c) 2000-2003 Lutz Mueller and others\n" + "Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s" "\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" @@ -871,8 +877,8 @@ if ((a.usb_vendor == usb_vendor) && (a.usb_product == usb_product)) { gp_log (GP_LOG_DEBUG, "main", - "Overriding USB vendor/product id " - "0x%x/0x%x with 0x%x/0x%x", + _("Overriding USB vendor/product id " + "0x%x/0x%x with 0x%x/0x%x"), a.usb_vendor, a.usb_product, usb_vendor_modified, usb_product_modified); a.usb_vendor = usb_vendor_modified; @@ -890,6 +896,9 @@ struct timeval glob_tv_zero = { 0, 0 }; static void +#ifdef __GNUC__ + __attribute__((__format__(printf,3,0))) +#endif debug_func (GPLogLevel level, const char *domain, const char *format, va_list args, void *data) { @@ -909,6 +918,13 @@ debug_action (GPParams *p) { int n; + + /* make sure we're only executed once */ + static int debug_flag = 0; + if (debug_flag != 0) + return(GP_OK); + debug_flag = 1; + gettimeofday (&glob_tv_zero, NULL); CR (p->debug_func_id = gp_log_add_func (GP_LOG_ALL, debug_func, NULL)); @@ -927,7 +943,7 @@ CHECK_NULL (v); CHECK_NULL (v[0]); gp_log (GP_LOG_DEBUG, "main", "%s %s", name, v[0]); - gp_log (GP_LOG_DEBUG, "main", "%s has been compiled with the following options:", name); + gp_log (GP_LOG_DEBUG, "main", _("%s has been compiled with the following options:"), name); for (i = 1; v[i] != NULL; i++) { gp_log (GP_LOG_DEBUG, "main", " + %s", v[i]); } @@ -935,3 +951,200 @@ return (GP_OK); } + +static void +display_widgets (CameraWidget *widget, char *prefix) { + int ret, n, i; + char *newprefix; + const char *label, *name, *uselabel; + CameraWidgetType type; + + gp_widget_get_label (widget, &label); + /* fprintf(stderr,"label is %s\n", label); */ + ret = gp_widget_get_name (widget, &name); + /* fprintf(stderr,"name is %s\n", name); */ + gp_widget_get_type (widget, &type); + + if (strlen(name)) + uselabel = name; + else + uselabel = label; + + n = gp_widget_count_children (widget); + + newprefix = malloc(strlen(prefix)+1+strlen(uselabel)+1); + sprintf(newprefix,"%s/%s",prefix,uselabel); + + if ((type != GP_WIDGET_WINDOW) && (type != GP_WIDGET_SECTION)) { + printf("%s\n",newprefix); + } + for (i=0; icamera, &rootconfig, p->context); + if (ret != GP_OK) return ret; + display_widgets (rootconfig, ""); + gp_widget_free (rootconfig); + return (GP_OK); +} + +int +get_config_action (GPParams *p, const char *name) { + CameraWidget *rootconfig,*child; + int ret; + const char *label; + CameraWidgetType type; + + ret = gp_camera_get_config (p->camera, &rootconfig, p->context); + if (ret != GP_OK) return ret; + ret = gp_widget_get_child_by_name (rootconfig, name, &child); + if (ret != GP_OK) { + char *part, *s, *newname; + + newname = strdup (name); + if (!newname) + return GP_ERROR_NO_MEMORY; + + child = rootconfig; + part = newname; + while (part[0] == '/') + part++; + while (1) { + CameraWidget *tmp; + + s = strchr (part,'/'); + if (s) + *s='\0'; + ret = gp_widget_get_child_by_name (child, part, &tmp); + if (ret != GP_OK) + break; + child = tmp; + if (!s) /* end of path */ + break; + part = s+1; + while (part[0] == '/') + part++; + } + if (s) { /* if we have stuff left over, we failed */ + gp_context_error (p->context, _("%s not found in configuration tree.\n"), newname); + free (newname); + gp_widget_free (rootconfig); + return GP_ERROR; + } + free (newname); + } + ret = gp_widget_get_type (child, &type); + if (ret != GP_OK) { + gp_widget_free (rootconfig); + return ret; + } + ret = gp_widget_get_label (child, &label); + if (ret != GP_OK) { + gp_widget_free (rootconfig); + return ret; + } + + printf ("Label: %s\n", label); /* "Label:" is not i18ned, the "label" variable is */ + switch (type) { + case GP_WIDGET_TEXT: { /* char * */ + char *txt; + + ret = gp_widget_get_value (child, &txt); + if (ret == GP_OK) { + printf ("Type: TEXT\n"); /* parsed by scripts, no i18n */ + printf ("Current: %s\n",txt); + } else { + gp_context_error (p->context, _("Failed to retrieve value of text widget %s.\n"), name); + } + break; + } + case GP_WIDGET_RANGE: { /* float */ + float f, t,b,s; + + ret = gp_widget_get_range (child, &b, &t, &s); + if (ret == GP_OK) + ret = gp_widget_get_value (child, &f); + if (ret == GP_OK) { + printf ("Type: RANGE\n"); /* parsed by scripts, no i18n */ + printf ("Current: %g\n", f); /* parsed by scripts, no i18n */ + printf ("Bottom: %g\n", b); /* parsed by scripts, no i18n */ + printf ("Top: %g\n", t); /* parsed by scripts, no i18n */ + printf ("Step: %g\n", s); /* parsed by scripts, no i18n */ + } else { + gp_context_error (p->context, _("Failed to retrieve values of range widget %s.\n"), name); + } + break; + } + case GP_WIDGET_TOGGLE: { /* int */ + int t; + + ret = gp_widget_get_value (child, &t); + if (ret == GP_OK) { + printf ("Type: TOGGLE\n"); + printf ("Current: %d\n",t); + } else { + gp_context_error (p->context, _("Failed to retrieve values of toggle widget %s.\n"), name); + } + break; + } + case GP_WIDGET_DATE: { /* int */ + int t; + time_t xtime; + + ret = gp_widget_get_value (child, &t); + if (ret == GP_OK) { + printf ("Type: DATE\n"); + printf ("Current: %d\n",t); + xtime = t; + printf ("Printable: %s\n",ctime (&xtime)); + } else { + gp_context_error (p->context, _("Failed to retrieve values of date/time widget %s.\n"), name); + } + break; + } + case GP_WIDGET_MENU: + case GP_WIDGET_RADIO: { /* char * */ + int cnt, i; + char *current; + + ret = gp_widget_get_value (child, ¤t); + if (ret == GP_OK) { + cnt = gp_widget_count_choices (child); + if (type == GP_WIDGET_MENU) + printf ("Type: MENU\n"); + else + printf ("Type: RADIO\n"); + printf ("Current: %s\n",current); + for ( i=0; icontext, _("Failed to retrieve values of radio widget %s.\n"), name); + } + break; + } + + /* ignore: */ + case GP_WIDGET_WINDOW: + case GP_WIDGET_SECTION: + case GP_WIDGET_BUTTON: + break; + } + gp_widget_free (rootconfig); + return (GP_OK); +} diff -Naur gphoto2-2.1.4/gphoto2/actions.h gphoto2/gphoto2/actions.h --- gphoto2-2.1.4/gphoto2/actions.h 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/actions.h 2004-09-12 20:00:34.000000000 +0200 @@ -68,5 +68,7 @@ int override_usbids_action (GPParams *, int usb_vendor, int usb_product, int usb_vendor_modified, int usb_product_modified); int debug_action (GPParams *); +int list_config_action (GPParams *); +int get_config_action (GPParams *, const char *name); #endif /* __ACTIONS_H__ */ diff -Naur gphoto2-2.1.4/gphoto2/gphoto2-cmd-config.c gphoto2/gphoto2/gphoto2-cmd-config.c --- gphoto2-2.1.4/gphoto2/gphoto2-cmd-config.c 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/gphoto2-cmd-config.c 2004-09-12 20:00:34.000000000 +0200 @@ -349,7 +349,6 @@ gp_widget_set_value (text, info); set_config (cmd_config); } - destroyCDKEntry (entry); return (GP_OK); } @@ -489,7 +488,7 @@ CHECK (gp_widget_get_range (range, &min, &max, &increment)); - if (!get_digits (increment)) + if (!get_digits (increment) && !get_digits (min) && !get_digits (max)) return (show_range_int (cmd_config, range)); else return (show_range_float (cmd_config, range)); diff -Naur gphoto2-2.1.4/gphoto2/gp-params.c gphoto2/gphoto2/gp-params.c --- gphoto2-2.1.4/gphoto2/gp-params.c 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/gp-params.c 2004-08-28 16:12:21.000000000 +0200 @@ -37,6 +37,9 @@ #endif static void +#ifdef __GNUC__ +__attribute__((__format__(printf,2,0))) +#endif ctx_status_func (GPContext *context, const char *format, va_list args, void *data) { @@ -46,6 +49,9 @@ } static void +#ifdef __GNUC__ +__attribute__((__format__(printf,2,0))) +#endif ctx_error_func (GPContext *context, const char *format, va_list args, void *data) { @@ -70,6 +76,9 @@ } progress_states[MAX_PROGRESS_STATES]; static unsigned int +#ifdef __GNUC__ +__attribute__((__format__(printf,3,0))) +#endif ctx_progress_start_func (GPContext *context, float target, const char *format, va_list args, void *data) { @@ -207,6 +216,9 @@ } static void +#ifdef __GNUC__ +__attribute__((__format__(printf,2,0))) +#endif ctx_message_func (GPContext *context, const char *format, va_list args, void *data) { diff -Naur gphoto2-2.1.4/gphoto2/main.c gphoto2/gphoto2/main.c --- gphoto2-2.1.4/gphoto2/main.c 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/main.c 2004-09-12 20:00:34.000000000 +0200 @@ -138,6 +138,8 @@ OPTION_CALLBACK(delete_file); OPTION_CALLBACK(delete_all_files); OPTION_CALLBACK(upload_file); +OPTION_CALLBACK(capture_frames); +OPTION_CALLBACK(capture_interval); OPTION_CALLBACK(capture_image); OPTION_CALLBACK(capture_preview); OPTION_CALLBACK(capture_movie); @@ -147,6 +149,8 @@ OPTION_CALLBACK(about); OPTION_CALLBACK(make_dir); OPTION_CALLBACK(remove_dir); +OPTION_CALLBACK(list_config); +OPTION_CALLBACK(get_config); /* 2) Add an entry in the option table */ /* ----------------------------------------------------------------- */ @@ -202,6 +206,10 @@ #ifdef HAVE_CDK {"" , "config", "", N_("Configure"), config, 0}, #endif +{"", "list-config", "", N_("List the configuration tree"), list_config, 0}, +{"", "get-config", "name", N_("Get a configuration variable"), get_config, 0}, +{"F" , "frames", "count", N_("Set number of frames to capture (default=infinite)"), capture_frames, 0}, +{"I" , "interval", "seconds", N_("Set capture interval in seconds"), capture_interval, 0}, {"" , "capture-preview", "", N_("Capture a quick preview"), capture_preview, 0}, {"" , "capture-image", "", N_("Capture an image"), capture_image, 0}, {"" , "capture-movie", "", N_("Capture a movie "), capture_movie, 0}, @@ -231,6 +239,8 @@ int glob_stdout=0; int glob_stdout_size=0; char glob_cancel = 0; +int glob_frames = 0; +int glob_interval = 0; GPParams p; @@ -297,6 +307,20 @@ return (GP_OK); } +OPTION_CALLBACK(get_config) +{ + CR (get_config_action (&p, arg)); + + return (GP_OK); +} + +OPTION_CALLBACK(list_config) +{ + CR (list_config_action (&p)); + + return (GP_OK); +} + OPTION_CALLBACK(list_ports) { CR (list_ports_action (&p)); @@ -401,6 +425,20 @@ return (GP_OK); } +OPTION_CALLBACK (capture_frames) +{ + glob_frames = atoi(arg); + + return (GP_OK); +} + +OPTION_CALLBACK (capture_interval) +{ + glob_interval = atoi(arg); + + return (GP_OK); +} + #ifdef HAVE_CDK OPTION_CALLBACK(config) { @@ -549,7 +587,7 @@ */ if (!folder) { gp_context_error (p.context, - _("You cannot use '%n' " + _("You cannot use '%%n' " "in combination with " "non-persistent files!")); return (GP_ERROR_BAD_PARAMETERS); @@ -922,28 +960,122 @@ static int capture_generic (CameraCaptureType type, const char *name) { - CameraFilePath path; - char *pathsep; - int result; - - result = gp_camera_capture (p.camera, type, &path, p.context); - if (result != GP_OK) { - cli_error_print("Could not capture."); - return (result); - } - - if (strcmp(path.folder, "/") == 0) - pathsep = ""; - else - pathsep = "/"; - - if (p.quiet) - printf ("%s%s%s\n", path.folder, pathsep, path.name); - else - printf (_("New file is in location %s%s%s on the camera\n"), - path.folder, pathsep, path.name); + CameraFilePath path, last; + char *pathsep; + int result, frames = 0; - return (GP_OK); + if(glob_interval) { + memset(&last, 0, sizeof(last)); + if (!p.quiet) + printf (_("Time-lapse mode enabled (interval: %ds).\n"), + glob_interval); + } + + while(++frames) { + if (!p.quiet && glob_interval) { + if(!glob_frames) + printf (_("Capturing frame #%d...\n"), frames); + else + printf (_("Capturing frame #%d/%d...\n"), frames, glob_frames); + } + + fflush(stdout); + + result = gp_camera_capture (p.camera, type, &path, p.context); + if (result != GP_OK) { + cli_error_print(_("Could not capture.")); + return (result); + } + + /* If my Canon EOS 10D is set to auto-focus and it is unable to + * get focus lock - it will return with *UNKNOWN* as the filename. + */ + if (glob_interval && strcmp(path.name, "*UNKNOWN*") == 0) { + if (!p.quiet) { + printf (_("Capture failed (auto-focus problem?)...\n")); + sleep(1); + continue; + } + } + + if (strcmp(path.folder, "/") == 0) + pathsep = ""; + else + pathsep = "/"; + + if (p.quiet) + printf ("%s%s%s\n", path.folder, pathsep, path.name); + else + printf (_("New file is in location %s%s%s on the camera\n"), + path.folder, pathsep, path.name); + + if(!glob_interval) break; + + if(strcmp(path.folder, last.folder)) { + memcpy(&last, &path, sizeof(last)); + + result = set_folder_action(&p, path.folder); + if (result != GP_OK) { + cli_error_print(_("Could not set folder.")); + return (result); + } + } + + /* XXX: I wonder if there is some way to determine if the camera + * is still writing the image because if we don't sleep here, + * the image will be corrupt when we attempt to download it. + * I assume this is a result of the camera still writing the + * data! I picked 2 seconds as a first try and it seems like + * enough time for high-quality JPEG on the Canon EOS 10D (with + * a San Disk Ultra II CF). May need to be increased for RAW + * images... I don't think this is the correct way to do this. + */ + sleep(2); + + result = get_file_common (path.name, GP_FILE_TYPE_NORMAL); + if (result != GP_OK) { + cli_error_print (_("Could not get image.")); + if(result == GP_ERROR_FILE_NOT_FOUND) { + /* Buggy libcanon.so? + * Can happen if this was the first capture after a + * CF card format, or during a directory roll-over, + * ie: CANON100 -> CANON101 + */ + cli_error_print ( _("Buggy libcanon.so?")); + } + return (result); + } + + if (!p.quiet) + printf (_("Deleting file %s%s%s on the camera\n"), + path.folder, pathsep, path.name); + + result = delete_file_action (&p, path.name); + if (result != GP_OK) { + cli_error_print ( _("Count not delete image.")); + return (result); + } + + /* Break if we've reached the requested number of frames + * to capture. + */ + if(glob_frames && frames == glob_frames) break; + + /* Without this, it seems that the second capture always fails. + * That is probably obvious... for me it was trial n' error. + */ + result = gp_camera_exit (p.camera, p.context); + if (result != GP_OK) { + cli_error_print (_("Could not close camera connection.")); + } + + if (!p.quiet && glob_interval) + printf (_("Sleeping for %d second(s)...\n"), glob_interval); + + if(sleep(glob_interval) != 0) break; + } + + return (GP_OK); } #ifndef HAVE_POPT @@ -1109,6 +1241,7 @@ printf (_("\nCancelling...\n")); glob_cancel = 1; + glob_interval = 0; } /* Main :) */ @@ -1120,6 +1253,8 @@ ARG_ABILITIES, ARG_ABOUT, ARG_AUTO_DETECT, + ARG_CAPTURE_FRAMES, + ARG_CAPTURE_INTERVAL, ARG_CAPTURE_IMAGE, ARG_CAPTURE_MOVIE, ARG_CAPTURE_PREVIEW, @@ -1136,6 +1271,7 @@ ARG_GET_ALL_RAW_DATA, ARG_GET_ALL_THUMBNAILS, ARG_GET_AUDIO_DATA, + ARG_GET_CONFIG, ARG_GET_FILE, ARG_GET_RAW_DATA, ARG_GET_THUMBNAIL, @@ -1161,7 +1297,8 @@ ARG_SUMMARY, ARG_UPLOAD_FILE, ARG_USBID, - ARG_VERSION + ARG_VERSION, + ARG_LIST_CONFIG } Arg; typedef enum { @@ -1272,6 +1409,12 @@ p.quiet = 1; glob_stdout = 1; break; + case ARG_CAPTURE_FRAMES: + glob_frames = atoi(arg); + break; + case ARG_CAPTURE_INTERVAL: + glob_interval = atoi(arg); + break; case ARG_STDOUT_SIZE: glob_stdout_size = 1; p.quiet = 1; @@ -1412,6 +1555,13 @@ break; case ARG_UPLOAD_FILE: params->p.r = action_camera_upload_file (&p, p.folder, arg); + break; + case ARG_LIST_CONFIG: + params->p.r = list_config_action (&p); + break; + case ARG_GET_CONFIG: + params->p.r = get_config_action (&p, arg); + break; default: break; }; @@ -1559,9 +1709,17 @@ {"config", '\0', POPT_ARG_NONE, NULL, ARG_CONFIG, N_("Configure"), NULL}, #endif + {"list-config", '\0', POPT_ARG_NONE, NULL, ARG_LIST_CONFIG, + N_("List configuration tree"), NULL}, + {"get-config", '\0', POPT_ARG_STRING, NULL, ARG_GET_CONFIG, + N_("Get configuration value"), NULL}, {"capture-preview", '\0', POPT_ARG_NONE, NULL, ARG_CAPTURE_PREVIEW, N_("Capture a quick preview"), NULL}, + {"frames", 'F', POPT_ARG_INT, NULL, ARG_CAPTURE_FRAMES, + N_("Set number of frames to capture (default=infinite)"), N_("count")}, + {"interval", 'I', POPT_ARG_INT, NULL, ARG_CAPTURE_INTERVAL, + N_("Set capture interval in seconds"), N_("seconds")}, {"capture-image", '\0', POPT_ARG_NONE, NULL, ARG_CAPTURE_IMAGE, N_("Capture an image"), NULL}, {"capture-movie", '\0', POPT_ARG_NONE, NULL, diff -Naur gphoto2-2.1.4/gphoto2/main.h gphoto2/gphoto2/main.h --- gphoto2-2.1.4/gphoto2/main.h 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/main.h 2004-04-20 21:04:44.000000000 +0200 @@ -31,7 +31,7 @@ char short_id[3]; char long_id[20]; char argument[32]; - char description[35]; + char description[55]; OPTION_CALLBACK((*execute)); int required; }; diff -Naur gphoto2-2.1.4/gphoto2/Makefile.in gphoto2/gphoto2/Makefile.in --- gphoto2-2.1.4/gphoto2/Makefile.in 2004-01-18 21:01:24.000000000 +0100 +++ gphoto2/gphoto2/Makefile.in 2004-10-18 16:10:25.012063295 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(gphoto2_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +23,6 @@ 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 @@ -35,7 +36,66 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +bin_PROGRAMS = gphoto2$(EXEEXT) +subdir = gphoto2 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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__gphoto2_SOURCES_DIST = gphoto2-cmd-capture.c gphoto2-cmd-capture.h \ + gphoto2-cmd-config.c gphoto2-cmd-config.h options.c options.h \ + actions.c actions.h foreach.c foreach.h globals.h gp-params.c \ + gp-params.h main.c main.h version.c version.h range.c range.h \ + shell.c shell.h +@HAVE_AA_TRUE@am__objects_1 = gphoto2-cmd-capture.$(OBJEXT) +@HAVE_CDK_TRUE@am__objects_2 = gphoto2-cmd-config.$(OBJEXT) +@HAVE_POPT_FALSE@am__objects_3 = options.$(OBJEXT) +am_gphoto2_OBJECTS = $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) actions.$(OBJEXT) foreach.$(OBJEXT) \ + gp-params.$(OBJEXT) main.$(OBJEXT) version.$(OBJEXT) \ + range.$(OBJEXT) shell.$(OBJEXT) +gphoto2_OBJECTS = $(am_gphoto2_OBJECTS) +am__DEPENDENCIES_1 = +gphoto2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(gphoto2_SOURCES) +DIST_SOURCES = $(am__gphoto2_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -75,6 +135,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -83,8 +144,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,6 +206,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -162,6 +228,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -177,9 +244,6 @@ gphoto2-cmd-capture.c gphoto2-cmd-capture.h \ i18n.h options.c options.h - -bin_PROGRAMS = gphoto2 - INCLUDES = \ -DGPHOTO2_LOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ @@ -188,16 +252,12 @@ $(CDK_CFLAGS) $(GP_CFLAGS) $(AA_CFLAGS) \ $(EXIF_CFLAGS) $(RL_CFLAGS) $(POPT_CFLAGS) - -@HAVE_CDK_TRUE@CDK_FILES = gphoto2-cmd-config.c gphoto2-cmd-config.h @HAVE_CDK_FALSE@CDK_FILES = - -@HAVE_AA_TRUE@AA_FILES = gphoto2-cmd-capture.c gphoto2-cmd-capture.h +@HAVE_CDK_TRUE@CDK_FILES = gphoto2-cmd-config.c gphoto2-cmd-config.h @HAVE_AA_FALSE@AA_FILES = - -@HAVE_POPT_TRUE@NO_POPT_FILES = +@HAVE_AA_TRUE@AA_FILES = gphoto2-cmd-capture.c gphoto2-cmd-capture.h @HAVE_POPT_FALSE@NO_POPT_FILES = options.c options.h - +@HAVE_POPT_TRUE@NO_POPT_FILES = gphoto2_SOURCES = \ $(AA_FILES) \ $(CDK_FILES) \ @@ -212,77 +272,54 @@ shell.c shell.h - #gphoto2_LDFLAGS = -export-dynamic gphoto2_LDADD = \ $(CDK_LIBS) $(AA_LIBS) $(JPEG_LIBS) $(PTHREAD_LIBS) \ $(EXIF_LIBS) $(INTLLIBS) $(RL_LIBS) $(GP_LIBS) $(POPT_LIBS) -subdir = gphoto2 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = gphoto2$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am__gphoto2_SOURCES_DIST = gphoto2-cmd-capture.c gphoto2-cmd-capture.h \ - gphoto2-cmd-config.c gphoto2-cmd-config.h options.c options.h \ - actions.c actions.h foreach.c foreach.h globals.h gp-params.c \ - gp-params.h main.c main.h version.c version.h range.c range.h \ - shell.c shell.h -@HAVE_AA_TRUE@am__objects_1 = gphoto2-cmd-capture.$(OBJEXT) -@HAVE_AA_FALSE@am__objects_1 = -@HAVE_CDK_TRUE@am__objects_2 = gphoto2-cmd-config.$(OBJEXT) -@HAVE_CDK_FALSE@am__objects_2 = -@HAVE_POPT_TRUE@am__objects_3 = -@HAVE_POPT_FALSE@am__objects_3 = options.$(OBJEXT) -am_gphoto2_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - actions.$(OBJEXT) foreach.$(OBJEXT) gp-params.$(OBJEXT) \ - main.$(OBJEXT) version.$(OBJEXT) range.$(OBJEXT) \ - shell.$(OBJEXT) -gphoto2_OBJECTS = $(am_gphoto2_OBJECTS) -gphoto2_DEPENDENCIES = -gphoto2_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/actions.Po ./$(DEPDIR)/foreach.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gp-params.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gphoto2-cmd-capture.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/gphoto2-cmd-config.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/options.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/range.Po ./$(DEPDIR)/shell.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/version.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(am__gphoto2_SOURCES_DIST) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(gphoto2_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 gphoto2/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu gphoto2/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +.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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + 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; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -290,8 +327,8 @@ @$(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; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: @@ -301,7 +338,7 @@ $(LINK) $(gphoto2_LDFLAGS) $(gphoto2_OBJECTS) $(gphoto2_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -318,36 +355,20 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@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 `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@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 `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -356,6 +377,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -367,10 +389,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + 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) @@ -393,10 +416,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -410,7 +429,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -428,9 +447,10 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) + 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 @@ -442,7 +462,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -450,7 +470,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -469,6 +489,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -504,11 +526,11 @@ .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 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 \ + 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 diff -Naur gphoto2-2.1.4/gphoto2/shell.c gphoto2/gphoto2/shell.c --- gphoto2-2.1.4/gphoto2/shell.c 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/gphoto2/shell.c 2004-07-01 12:27:58.000000000 +0200 @@ -148,7 +148,7 @@ static char * shell_read_line (void) { - char prompt[70], buf[1024], *line; + char prompt[70], buf[1024], *line, *tmp; if (p->quiet) snprintf (prompt, sizeof (prompt), SHELL_PROMPT, "\0", "\0"); @@ -167,13 +167,17 @@ line = readline (prompt); if (line) add_history (line); + else + return (NULL); #else line = malloc (1024); if (!line) return (NULL); printf (SHELL_PROMPT, prompt, p->folder); fflush(stdout); - fgets (line, 1023, stdin); + tmp = fgets (line, 1023, stdin); + if (tmp == NULL) + return (NULL); line[strlen (line) - 1] = '\0'; #endif return (line); @@ -223,10 +227,10 @@ } /* Search 'text' */ - for (; func[x].command; x++) + for (; func[x].function; x++) if (!strncmp (func[x].command, text, len)) break; - if (func[x].command) + if (func[x].function) return (strdup (func[x++].command)); return (NULL); diff -Naur gphoto2-2.1.4/install-sh gphoto2/install-sh --- gphoto2-2.1.4/install-sh 2003-10-08 17:21:39.000000000 +0200 +++ gphoto2/install-sh 2004-10-18 16:10:24.697113135 +0200 @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2004-07-05.00 + # 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. @@ -41,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}" @@ -59,236 +58,265 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -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 -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--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 + -c) 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;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -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 [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - 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 - : - fi -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='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + -T) no_target_directory=true shift + continue;; - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi + --version) echo "$0 $scriptversion"; exit 0;; - pathcomp=$pathcomp/ + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && 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 -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; 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 - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - -# Trap to clean up 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. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# 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 [ -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. +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 - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +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 + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $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 -fi && + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + 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" + # 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 + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$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 + 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 + + # Copy the file name to the temp name. + $doit $cpprog "$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 $cpprog $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 # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (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 -Naur gphoto2-2.1.4/intl/bindtextdom.c gphoto2/intl/bindtextdom.c --- gphoto2-2.1.4/intl/bindtextdom.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/bindtextdom.c 2004-10-18 16:09:15.460069551 +0200 @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -86,11 +86,6 @@ # define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset #endif -/* Prototypes for local functions. */ -static void set_binding_values PARAMS ((const char *domainname, - const char **dirnamep, - const char **codesetp)); - /* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP to be used for the DOMAINNAME message catalog. If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not @@ -98,10 +93,8 @@ If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither modified nor returned. */ static void -set_binding_values (domainname, dirnamep, codesetp) - const char *domainname; - const char **dirnamep; - const char **codesetp; +set_binding_values (const char *domainname, + const char **dirnamep, const char **codesetp) { struct binding *binding; int modified; @@ -348,9 +341,7 @@ /* Specify that the DOMAINNAME message catalog will be found in DIRNAME rather than in the system locale data base. */ char * -BINDTEXTDOMAIN (domainname, dirname) - const char *domainname; - const char *dirname; +BINDTEXTDOMAIN (const char *domainname, const char *dirname) { set_binding_values (domainname, &dirname, NULL); return (char *) dirname; @@ -359,9 +350,7 @@ /* Specify the character encoding in which the messages from the DOMAINNAME message catalog will be returned. */ char * -BIND_TEXTDOMAIN_CODESET (domainname, codeset) - const char *domainname; - const char *codeset; +BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset) { set_binding_values (domainname, NULL, &codeset); return (char *) codeset; diff -Naur gphoto2-2.1.4/intl/ChangeLog gphoto2/intl/ChangeLog --- gphoto2-2.1.4/intl/ChangeLog 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/ChangeLog 2004-10-18 16:09:15.463069077 +0200 @@ -1,4 +1,4 @@ -2003-05-22 GNU +2004-01-29 GNU - * Version 0.12.1 released. + * Version 0.14.1 released. diff -Naur gphoto2-2.1.4/intl/config.charset gphoto2/intl/config.charset --- gphoto2-2.1.4/intl/config.charset 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/config.charset 2004-10-18 16:09:15.467068444 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2003 Free Software Foundation, Inc. +# Copyright (C) 2000-2004 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -30,77 +30,77 @@ # MIME charset name is preferred. # The current list of GNU canonical charset names is as follows. # -# name used by which systems a MIME name? -# ASCII, ANSI_X3.4-1968 glibc solaris freebsd -# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-3 glibc solaris yes -# ISO-8859-4 osf solaris freebsd yes -# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes -# ISO-8859-6 glibc aix hpux solaris yes -# ISO-8859-7 glibc aix hpux irix osf solaris yes -# ISO-8859-8 glibc aix hpux osf solaris yes -# ISO-8859-9 glibc aix hpux irix osf solaris yes -# ISO-8859-13 glibc -# ISO-8859-14 glibc -# ISO-8859-15 glibc aix osf solaris freebsd -# KOI8-R glibc solaris freebsd yes -# KOI8-U glibc freebsd yes -# KOI8-T glibc -# CP437 dos -# CP775 dos -# CP850 aix osf dos -# CP852 dos -# CP855 dos -# CP856 aix -# CP857 dos -# CP861 dos -# CP862 dos -# CP864 dos -# CP865 dos -# CP866 freebsd dos -# CP869 dos -# CP874 woe32 dos -# CP922 aix -# CP932 aix woe32 dos -# CP943 aix -# CP949 osf woe32 dos -# CP950 woe32 dos -# CP1046 aix -# CP1124 aix -# CP1125 dos -# CP1129 aix -# CP1250 woe32 -# CP1251 glibc solaris woe32 -# CP1252 aix woe32 -# CP1253 woe32 -# CP1254 woe32 -# CP1255 glibc woe32 -# CP1256 woe32 -# CP1257 woe32 -# GB2312 glibc aix hpux irix solaris freebsd yes -# EUC-JP glibc aix hpux irix osf solaris freebsd yes -# EUC-KR glibc aix hpux irix osf solaris freebsd yes -# EUC-TW glibc aix hpux irix osf solaris -# BIG5 glibc aix hpux osf solaris freebsd yes -# BIG5-HKSCS glibc solaris -# GBK glibc aix osf solaris woe32 dos -# GB18030 glibc solaris -# SHIFT_JIS hpux osf solaris freebsd yes -# JOHAB glibc solaris woe32 -# TIS-620 glibc aix hpux osf solaris -# VISCII glibc yes -# TCVN5712-1 glibc -# GEORGIAN-PS glibc -# HP-ROMAN8 hpux -# HP-ARABIC8 hpux -# HP-GREEK8 hpux -# HP-HEBREW8 hpux -# HP-TURKISH8 hpux -# HP-KANA8 hpux -# DEC-KANJI osf -# DEC-HANYU osf -# UTF-8 glibc aix hpux osf solaris yes +# name MIME? used by which systems +# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin +# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-3 Y glibc solaris +# ISO-8859-4 Y osf solaris freebsd darwin +# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin +# ISO-8859-6 Y glibc aix hpux solaris +# ISO-8859-7 Y glibc aix hpux irix osf solaris +# ISO-8859-8 Y glibc aix hpux osf solaris +# ISO-8859-9 Y glibc aix hpux irix osf solaris +# ISO-8859-13 glibc +# ISO-8859-14 glibc +# ISO-8859-15 glibc aix osf solaris freebsd +# KOI8-R Y glibc solaris freebsd darwin +# KOI8-U Y glibc freebsd darwin +# KOI8-T glibc +# CP437 dos +# CP775 dos +# CP850 aix osf dos +# CP852 dos +# CP855 dos +# CP856 aix +# CP857 dos +# CP861 dos +# CP862 dos +# CP864 dos +# CP865 dos +# CP866 freebsd darwin dos +# CP869 dos +# CP874 woe32 dos +# CP922 aix +# CP932 aix woe32 dos +# CP943 aix +# CP949 osf woe32 dos +# CP950 woe32 dos +# CP1046 aix +# CP1124 aix +# CP1125 dos +# CP1129 aix +# CP1250 woe32 +# CP1251 glibc solaris darwin woe32 +# CP1252 aix woe32 +# CP1253 woe32 +# CP1254 woe32 +# CP1255 glibc woe32 +# CP1256 woe32 +# CP1257 woe32 +# GB2312 Y glibc aix hpux irix solaris freebsd darwin +# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin +# EUC-TW glibc aix hpux irix osf solaris +# BIG5 Y glibc aix hpux osf solaris freebsd darwin +# BIG5-HKSCS glibc solaris +# GBK glibc aix osf solaris woe32 dos +# GB18030 glibc solaris +# SHIFT_JIS Y hpux osf solaris freebsd darwin +# JOHAB glibc solaris woe32 +# TIS-620 glibc aix hpux osf solaris +# VISCII Y glibc +# TCVN5712-1 glibc +# GEORGIAN-PS glibc +# HP-ROMAN8 hpux +# HP-ARABIC8 hpux +# HP-GREEK8 hpux +# HP-HEBREW8 hpux +# HP-TURKISH8 hpux +# HP-KANA8 hpux +# DEC-KANJI osf +# DEC-HANYU osf +# UTF-8 Y glibc aix hpux osf solaris # # Note: Names which are not marked as being a MIME name should not be used in # Internet protocols for information interchange (mail, news, etc.). @@ -121,6 +121,105 @@ # 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 @@ -297,6 +396,47 @@ 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" @@ -410,6 +550,7 @@ echo "sq CP852" echo "sq_AL CP852" echo "sr CP852" # CP852 or CP866 or CP855 ?? + echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? # ISO-8859-3 languages echo "mt CP850" diff -Naur gphoto2-2.1.4/intl/dcgettext.c gphoto2/intl/dcgettext.c --- gphoto2-2.1.4/intl/dcgettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/dcgettext.c 2004-10-18 16:09:15.471067811 +0200 @@ -1,5 +1,5 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -44,10 +44,7 @@ /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCGETTEXT (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; +DCGETTEXT (const char *domainname, const char *msgid, int category) { return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); } diff -Naur gphoto2-2.1.4/intl/dcigettext.c gphoto2/intl/dcigettext.c --- gphoto2-2.1.4/intl/dcigettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/dcigettext.c 2004-10-18 16:09:15.475067178 +0200 @@ -148,13 +148,17 @@ char *getwd (); # define getcwd(buf, max) getwd (buf) # else +# if VMS +# define getcwd(buf, max) (getcwd) (buf, max, 0) +# else char *getcwd (); +# endif # endif # ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); +static char *stpcpy (char *dest, const char *src); # endif # ifndef HAVE_MEMPCPY -static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); +static void *mempcpy (void *dest, const void *src, size_t n); # endif #endif @@ -248,11 +252,8 @@ # endif /* Function to compare two entries in the table of known translations. */ -static int transcmp PARAMS ((const void *p1, const void *p2)); static int -transcmp (p1, p2) - const void *p1; - const void *p2; +transcmp (const void *p1, const void *p2) { const struct known_translation_t *s1; const struct known_translation_t *s2; @@ -304,19 +305,18 @@ struct binding *_nl_domain_bindings; /* Prototypes for local functions. */ -static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain, - unsigned long int n, - const char *translation, - size_t translation_len)) +static char *plural_lookup (struct loaded_l10nfile *domain, + unsigned long int n, + const char *translation, size_t translation_len) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) +static const char *guess_category_value (int category, + const char *categoryname) internal_function; #ifdef _LIBC # include "../locale/localeinfo.h" # define category_to_name(category) _nl_category_names[category] #else -static const char *category_to_name PARAMS ((int category)) internal_function; +static const char *category_to_name (int category) internal_function; #endif @@ -424,13 +424,8 @@ CATEGORY locale and, if PLURAL is nonzero, search over string depending on the plural form determined by N. */ char * -DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - int plural; - unsigned long int n; - int category; +DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2, + int plural, unsigned long int n, int category) { #ifndef HAVE_ALLOCA struct block_list *block_list = NULL; @@ -703,11 +698,10 @@ #ifndef _LIBC if (!ENABLE_SECURE) { - extern void _nl_log_untranslated PARAMS ((const char *logfilename, - const char *domainname, - const char *msgid1, - const char *msgid2, - int plural)); + 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') @@ -724,11 +718,9 @@ char * internal_function -_nl_find_msg (domain_file, domainbinding, msgid, lengthp) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; - const char *msgid; - size_t *lengthp; +_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) { struct loaded_domain *domain; nls_uint32 nstrings; @@ -1035,11 +1027,8 @@ /* Look up a plural variant. */ static char * internal_function -plural_lookup (domain, n, translation, translation_len) - struct loaded_l10nfile *domain; - unsigned long int n; - const char *translation; - size_t translation_len; +plural_lookup (struct loaded_l10nfile *domain, unsigned long int n, + const char *translation, size_t translation_len) { struct loaded_domain *domaindata = (struct loaded_domain *) domain->data; unsigned long int index; @@ -1076,8 +1065,7 @@ /* Return string representation of locale CATEGORY. */ static const char * internal_function -category_to_name (category) - int category; +category_to_name (int category) { const char *retval; @@ -1137,9 +1125,7 @@ /* Guess value of current locale from value of the environment variables. */ static const char * internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; +guess_category_value (int category, const char *categoryname) { const char *language; const char *retval; @@ -1180,9 +1166,7 @@ to be defined. */ #if !_LIBC && !HAVE_STPCPY static char * -stpcpy (dest, src) - char *dest; - const char *src; +stpcpy (char *dest, const char *src) { while ((*dest++ = *src++) != '\0') /* Do nothing. */ ; @@ -1192,10 +1176,7 @@ #if !_LIBC && !HAVE_MEMPCPY static void * -mempcpy (dest, src, n) - void *dest; - const void *src; - size_t n; +mempcpy (void *dest, const void *src, size_t n) { return (void *) ((char *) memcpy (dest, src, n) + n); } diff -Naur gphoto2-2.1.4/intl/dcngettext.c gphoto2/intl/dcngettext.c --- gphoto2-2.1.4/intl/dcngettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/dcngettext.c 2004-10-18 16:09:15.479066545 +0200 @@ -1,5 +1,5 @@ /* Implementation of the dcngettext(3) function. - Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -44,12 +44,9 @@ /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCNGETTEXT (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; +DCNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) { return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); } diff -Naur gphoto2-2.1.4/intl/dgettext.c gphoto2/intl/dgettext.c --- gphoto2-2.1.4/intl/dgettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/dgettext.c 2004-10-18 16:09:15.482066070 +0200 @@ -1,5 +1,5 @@ /* Implementation of the dgettext(3) function. - Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -20,9 +20,10 @@ # include #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else @@ -46,9 +47,7 @@ /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale. */ char * -DGETTEXT (domainname, msgid) - const char *domainname; - const char *msgid; +DGETTEXT (const char *domainname, const char *msgid) { return DCGETTEXT (domainname, msgid, LC_MESSAGES); } diff -Naur gphoto2-2.1.4/intl/dngettext.c gphoto2/intl/dngettext.c --- gphoto2-2.1.4/intl/dngettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/dngettext.c 2004-10-18 16:09:15.487065279 +0200 @@ -1,5 +1,5 @@ /* Implementation of the dngettext(3) function. - Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -20,9 +20,10 @@ # include #endif +#include "gettextP.h" + #include -#include "gettextP.h" #ifdef _LIBC # include #else @@ -46,11 +47,8 @@ /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale and skip message according to the plural form. */ char * -DNGETTEXT (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; +DNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) { return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); } diff -Naur gphoto2-2.1.4/intl/eval-plural.h gphoto2/intl/eval-plural.h --- gphoto2-2.1.4/intl/eval-plural.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/eval-plural.h 2004-10-18 16:09:15.491064646 +0200 @@ -1,5 +1,5 @@ /* Plural expression evaluation. - Copyright (C) 2000-2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -21,16 +21,10 @@ #endif /* Evaluate the plural expression and return an index value. */ -STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp, - unsigned long int n)) - internal_function; - STATIC unsigned long int internal_function -plural_eval (pexp, n) - struct expression *pexp; - unsigned long int n; +plural_eval (struct expression *pexp, unsigned long int n) { switch (pexp->nargs) { diff -Naur gphoto2-2.1.4/intl/explodename.c gphoto2/intl/explodename.c --- gphoto2-2.1.4/intl/explodename.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/explodename.c 2004-10-18 16:09:15.494064172 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -38,8 +38,7 @@ /* @@ end of prolog @@ */ char * -_nl_find_language (name) - const char *name; +_nl_find_language (const char *name) { while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '+' && name[0] != ',') @@ -50,17 +49,11 @@ int -_nl_explode_name (name, language, modifier, territory, codeset, - normalized_codeset, special, sponsor, revision) - char *name; - const char **language; - const char **modifier; - const char **territory; - const char **codeset; - const char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; +_nl_explode_name (char *name, + const char **language, const char **modifier, + const char **territory, const char **codeset, + const char **normalized_codeset, const char **special, + const char **sponsor, const char **revision) { enum { undecided, xpg, cen } syntax; char *cp; diff -Naur gphoto2-2.1.4/intl/finddomain.c gphoto2/intl/finddomain.c --- gphoto2-2.1.4/intl/finddomain.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/finddomain.c 2004-10-18 16:09:15.498063539 +0200 @@ -1,5 +1,5 @@ /* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -47,11 +47,8 @@ established bindings. */ struct loaded_l10nfile * internal_function -_nl_find_domain (dirname, locale, domainname, domainbinding) - const char *dirname; - char *locale; - const char *domainname; - struct binding *domainbinding; +_nl_find_domain (const char *dirname, char *locale, + const char *domainname, struct binding *domainbinding) { struct loaded_l10nfile *retval; const char *language; diff -Naur gphoto2-2.1.4/intl/gettext.c gphoto2/intl/gettext.c --- gphoto2-2.1.4/intl/gettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/gettext.c 2004-10-18 16:09:15.501063064 +0200 @@ -1,5 +1,5 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -52,8 +52,7 @@ LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -GETTEXT (msgid) - const char *msgid; +GETTEXT (const char *msgid) { return DCGETTEXT (NULL, msgid, LC_MESSAGES); } diff -Naur gphoto2-2.1.4/intl/gettextP.h gphoto2/intl/gettextP.h --- gphoto2-2.1.4/intl/gettextP.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/gettextP.h 2004-10-18 16:09:15.505062431 +0200 @@ -36,14 +36,6 @@ /* @@ end of prolog @@ */ -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - #ifndef internal_function # define internal_function #endif @@ -159,64 +151,63 @@ extern int _nl_msg_cat_cntr; #ifndef _LIBC -const char *_nl_locale_name PARAMS ((int category, const char *categoryname)); +const char *_nl_locale_name (int category, const char *categoryname); #endif -struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, - char *__locale, - const char *__domainname, - struct binding *__domainbinding)) +struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, + const char *__domainname, + struct binding *__domainbinding) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, - struct binding *__domainbinding)) +void _nl_load_domain (struct loaded_l10nfile *__domain, + struct binding *__domainbinding) internal_function; -void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) +void _nl_unload_domain (struct loaded_domain *__domain) internal_function; -const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, - struct loaded_domain *__domain, - struct binding *__domainbinding)) +const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding) internal_function; -void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) +void _nl_free_domain_conv (struct loaded_domain *__domain) internal_function; -char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, - struct binding *domainbinding, - const char *msgid, size_t *lengthp)) +char *_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + size_t *lengthp) internal_function; #ifdef _LIBC -extern char *__gettext PARAMS ((const char *__msgid)); -extern char *__dgettext PARAMS ((const char *__domainname, - const char *__msgid)); -extern char *__dcgettext PARAMS ((const char *__domainname, - const char *__msgid, int __category)); -extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, - unsigned long int __n)); -extern char *__dngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int n)); -extern char *__dcngettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category)); -extern char *__dcigettext PARAMS ((const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); -extern char *__textdomain PARAMS ((const char *__domainname)); -extern char *__bindtextdomain PARAMS ((const char *__domainname, - const char *__dirname)); -extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, - const char *__codeset)); +extern char *__gettext (const char *__msgid); +extern char *__dgettext (const char *__domainname, const char *__msgid); +extern char *__dcgettext (const char *__domainname, const char *__msgid, + int __category); +extern char *__ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +extern char *__dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n); +extern char *__dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +extern char *__dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); +extern char *__textdomain (const char *__domainname); +extern char *__bindtextdomain (const char *__domainname, + const char *__dirname); +extern char *__bind_textdomain_codeset (const char *__domainname, + const char *__codeset); #else /* 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 PARAMS ((const char *__domainname, - const char *__msgid1, - const char *__msgid2, - int __plural, unsigned long int __n, - int __category)); +extern char *libintl_dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); #endif /* @@ begin of epilog @@ */ diff -Naur gphoto2-2.1.4/intl/gmo.h gphoto2/intl/gmo.h --- gphoto2-2.1.4/intl/gmo.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/gmo.h 2004-10-18 16:09:15.508061957 +0200 @@ -1,5 +1,5 @@ /* Description of GNU message catalog format: general file layout. - Copyright (C) 1995, 1997, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -29,6 +29,7 @@ /* Revision number of the currently used .mo (binary) file format. */ #define MO_REVISION_NUMBER 0 +#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1 /* The following contortions are an attempt to use the C preprocessor to determine an unsigned integral type that is 32 bits wide. An @@ -76,7 +77,7 @@ /* The revision number of the file format. */ nls_uint32 revision; - /* The following are only used in .mo files with major revision 0. */ + /* The following are only used in .mo files with major revision 0 or 1. */ /* The number of strings pairs. */ nls_uint32 nstrings; diff -Naur gphoto2-2.1.4/intl/hash-string.h gphoto2/intl/hash-string.h --- gphoto2-2.1.4/intl/hash-string.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/hash-string.h 2004-10-18 16:09:15.512061324 +0200 @@ -1,5 +1,5 @@ /* Description of GNU message catalog format: string hashing function. - Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -18,14 +18,6 @@ /* @@ end of prolog @@ */ -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - /* We assume to have `unsigned long int' value with at least 32 bits. */ #define HASHWORDBITS 32 @@ -33,11 +25,8 @@ /* Defines the so called `hashpjw' function by P.J. Weinberger [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ -static unsigned long int hash_string PARAMS ((const char *__str_param)); - static inline unsigned long int -hash_string (str_param) - const char *str_param; +hash_string (const char *str_param) { unsigned long int hval, g; const char *str = str_param; @@ -47,7 +36,7 @@ while (*str != '\0') { hval <<= 4; - hval += (unsigned long int) *str++; + hval += (unsigned char) *str++; g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); if (g != 0) { diff -Naur gphoto2-2.1.4/intl/intl-compat.c gphoto2/intl/intl-compat.c --- gphoto2-2.1.4/intl/intl-compat.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/intl-compat.c 2004-10-18 16:09:15.518060374 +0200 @@ -58,8 +58,7 @@ DLL_EXPORTED char * -gettext (msgid) - const char *msgid; +gettext (const char *msgid) { return libintl_gettext (msgid); } @@ -67,9 +66,7 @@ DLL_EXPORTED char * -dgettext (domainname, msgid) - const char *domainname; - const char *msgid; +dgettext (const char *domainname, const char *msgid) { return libintl_dgettext (domainname, msgid); } @@ -77,10 +74,7 @@ DLL_EXPORTED char * -dcgettext (domainname, msgid, category) - const char *domainname; - const char *msgid; - int category; +dcgettext (const char *domainname, const char *msgid, int category) { return libintl_dcgettext (domainname, msgid, category); } @@ -88,10 +82,7 @@ DLL_EXPORTED char * -ngettext (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; +ngettext (const char *msgid1, const char *msgid2, unsigned long int n) { return libintl_ngettext (msgid1, msgid2, n); } @@ -99,11 +90,8 @@ DLL_EXPORTED char * -dngettext (domainname, msgid1, msgid2, n) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; +dngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) { return libintl_dngettext (domainname, msgid1, msgid2, n); } @@ -111,12 +99,9 @@ DLL_EXPORTED char * -dcngettext (domainname, msgid1, msgid2, n, category) - const char *domainname; - const char *msgid1; - const char *msgid2; - unsigned long int n; - int category; +dcngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) { return libintl_dcngettext (domainname, msgid1, msgid2, n, category); } @@ -124,8 +109,7 @@ DLL_EXPORTED char * -textdomain (domainname) - const char *domainname; +textdomain (const char *domainname) { return libintl_textdomain (domainname); } @@ -133,9 +117,7 @@ DLL_EXPORTED char * -bindtextdomain (domainname, dirname) - const char *domainname; - const char *dirname; +bindtextdomain (const char *domainname, const char *dirname) { return libintl_bindtextdomain (domainname, dirname); } @@ -143,9 +125,7 @@ DLL_EXPORTED char * -bind_textdomain_codeset (domainname, codeset) - const char *domainname; - const char *codeset; +bind_textdomain_codeset (const char *domainname, const char *codeset) { return libintl_bind_textdomain_codeset (domainname, codeset); } diff -Naur gphoto2-2.1.4/intl/l10nflist.c gphoto2/intl/l10nflist.c --- gphoto2-2.1.4/intl/l10nflist.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/l10nflist.c 2004-10-18 16:09:15.521059900 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ # endif #else # ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); +static char *stpcpy (char *dest, const char *src); # endif #endif @@ -84,12 +84,8 @@ #if !defined _LIBC && !defined HAVE___ARGZ_COUNT /* Returns the number of strings in ARGZ. */ -static size_t argz_count__ PARAMS ((const char *argz, size_t len)); - static size_t -argz_count__ (argz, len) - const char *argz; - size_t len; +argz_count__ (const char *argz, size_t len) { size_t count = 0; while (len > 0) @@ -112,13 +108,8 @@ #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ -static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); - static void -argz_stringify__ (argz, len, sep) - char *argz; - size_t len; - int sep; +argz_stringify__ (char *argz, size_t len, int sep) { while (len > 0) { @@ -139,14 +130,8 @@ #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ #if !defined _LIBC && !defined HAVE___ARGZ_NEXT -static char *argz_next__ PARAMS ((char *argz, size_t argz_len, - const char *entry)); - static char * -argz_next__ (argz, argz_len, entry) - char *argz; - size_t argz_len; - const char *entry; +argz_next__ (char *argz, size_t argz_len, const char *entry) { if (entry) { @@ -167,11 +152,8 @@ /* Return number of bits set in X. */ -static int pop PARAMS ((int x)); - static inline int -pop (x) - int x; +pop (int x) { /* We assume that no more than 16 bits are used. */ x = ((x & ~0x5555) >> 1) + (x & 0x5555); @@ -184,23 +166,13 @@ struct loaded_l10nfile * -_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, - territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, do_allocate) - struct loaded_l10nfile **l10nfile_list; - const char *dirlist; - size_t dirlist_len; - int mask; - const char *language; - const char *territory; - const char *codeset; - const char *normalized_codeset; - const char *modifier; - const char *special; - const char *sponsor; - const char *revision; - const char *filename; - int do_allocate; +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, + int mask, const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate) { char *abs_filename; struct loaded_l10nfile **lastp; @@ -393,9 +365,7 @@ names. The return value is dynamically allocated and has to be freed by the caller. */ const char * -_nl_normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; +_nl_normalize_codeset (const char *codeset, size_t name_len) { int len = 0; int only_digit = 1; @@ -442,9 +412,7 @@ to be defined. */ #if !_LIBC && !HAVE_STPCPY static char * -stpcpy (dest, src) - char *dest; - const char *src; +stpcpy (char *dest, const char *src) { while ((*dest++ = *src++) != '\0') /* Do nothing. */ ; diff -Naur gphoto2-2.1.4/intl/libgnuintl.h gphoto2/intl/libgnuintl.h --- gphoto2-2.1.4/intl/libgnuintl.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/libgnuintl.h 2004-10-18 16:09:15.525059267 +0200 @@ -0,0 +1,138 @@ +/* Message catalogs for internationalization. + Copyright (C) 1995-1997, 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 _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 + +/* Resolve a platform specific conflict on DJGPP. GNU gettext takes + precedence over _conio_gettext. */ +#ifdef __DJGPP__ +# undef gettext +# define gettext gettext +#endif + +/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers + used by programs. Similarly, test __PROTOTYPES, not PROTOTYPES. */ +#ifndef _INTL_PARAMS +# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES +# define _INTL_PARAMS(args) args +# else +# define _INTL_PARAMS(args) () +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#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). */ +extern char *gettext _INTL_PARAMS ((const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current + LC_MESSAGES locale. */ +extern char *dgettext _INTL_PARAMS ((const char *__domainname, + const char *__msgid)); + +/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY + locale. */ +extern char *dcgettext _INTL_PARAMS ((const char *__domainname, + const char *__msgid, + int __category)); + + +/* Similar to `gettext' but select the plural form corresponding to the + number N. */ +extern char *ngettext _INTL_PARAMS ((const char *__msgid1, + const char *__msgid2, + unsigned long int __n)); + +/* Similar to `dgettext' but select the plural form corresponding to the + number N. */ +extern char *dngettext _INTL_PARAMS ((const char *__domainname, + const char *__msgid1, + const char *__msgid2, + unsigned long int __n)); + +/* Similar to `dcgettext' but select the plural form corresponding to the + number N. */ +extern char *dcngettext _INTL_PARAMS ((const char *__domainname, + const char *__msgid1, + const char *__msgid2, + unsigned long int __n, + int __category)); + + +/* Set the current default message catalog to DOMAINNAME. + If DOMAINNAME is null, return the current default. + If DOMAINNAME is "", reset to the default of "messages". */ +extern char *textdomain _INTL_PARAMS ((const char *__domainname)); + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname, + const char *__dirname)); + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname, + const char *__codeset)); + + +/* Optimized version of the functions above. */ +#if defined __OPTIMIZED +/* These are macros, but could also be inline functions. */ + +# define gettext(msgid) \ + dgettext (NULL, msgid) + +# define dgettext(domainname, msgid) \ + dcgettext (domainname, msgid, LC_MESSAGES) + +# define ngettext(msgid1, msgid2, n) \ + dngettext (NULL, msgid1, msgid2, n) + +# define dngettext(domainname, msgid1, msgid2, n) \ + dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES) + +#endif /* Optimizing. */ + + +#ifdef __cplusplus +} +#endif + +#endif /* libintl.h */ diff -Naur gphoto2-2.1.4/intl/libgnuintl.h.in gphoto2/intl/libgnuintl.h.in --- gphoto2-2.1.4/intl/libgnuintl.h.in 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/libgnuintl.h.in 2004-10-18 16:09:15.529058634 +0200 @@ -47,16 +47,6 @@ # undef gettext #endif -/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers - used by programs. Similarly, test __PROTOTYPES, not PROTOTYPES. */ -#ifndef _INTL_PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define _INTL_PARAMS(args) args -# else -# define _INTL_PARAMS(args) () -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -93,7 +83,7 @@ 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 __STDC__ || defined __cplusplus) +# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus) # define _INTL_REDIRECT_ASM # else # ifdef __cplusplus @@ -125,7 +115,7 @@ #ifdef _INTL_REDIRECT_MACROS # define gettext libintl_gettext #endif -extern char *gettext _INTL_PARAMS ((const char *__msgid)) +extern char *gettext (const char *__msgid) _INTL_ASM (libintl_gettext); #endif @@ -141,8 +131,7 @@ #ifdef _INTL_REDIRECT_MACROS # define dgettext libintl_dgettext #endif -extern char *dgettext _INTL_PARAMS ((const char *__domainname, - const char *__msgid)) +extern char *dgettext (const char *__domainname, const char *__msgid) _INTL_ASM (libintl_dgettext); #endif @@ -160,9 +149,8 @@ #ifdef _INTL_REDIRECT_MACROS # define dcgettext libintl_dcgettext #endif -extern char *dcgettext _INTL_PARAMS ((const char *__domainname, - const char *__msgid, - int __category)) +extern char *dcgettext (const char *__domainname, const char *__msgid, + int __category) _INTL_ASM (libintl_dcgettext); #endif @@ -181,9 +169,8 @@ #ifdef _INTL_REDIRECT_MACROS # define ngettext libintl_ngettext #endif -extern char *ngettext _INTL_PARAMS ((const char *__msgid1, - const char *__msgid2, - unsigned long int __n)) +extern char *ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n) _INTL_ASM (libintl_ngettext); #endif @@ -201,10 +188,9 @@ #ifdef _INTL_REDIRECT_MACROS # define dngettext libintl_dngettext #endif -extern char *dngettext _INTL_PARAMS ((const char *__domainname, - 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) _INTL_ASM (libintl_dngettext); #endif @@ -224,11 +210,9 @@ #ifdef _INTL_REDIRECT_MACROS # define dcngettext libintl_dcngettext #endif -extern char *dcngettext _INTL_PARAMS ((const char *__domainname, - const char *__msgid1, - const char *__msgid2, - unsigned long int __n, - int __category)) +extern char *dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category) _INTL_ASM (libintl_dcngettext); #endif @@ -246,7 +230,7 @@ #ifdef _INTL_REDIRECT_MACROS # define textdomain libintl_textdomain #endif -extern char *textdomain _INTL_PARAMS ((const char *__domainname)) +extern char *textdomain (const char *__domainname) _INTL_ASM (libintl_textdomain); #endif @@ -264,8 +248,7 @@ #ifdef _INTL_REDIRECT_MACROS # define bindtextdomain libintl_bindtextdomain #endif -extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname, - const char *__dirname)) +extern char *bindtextdomain (const char *__domainname, const char *__dirname) _INTL_ASM (libintl_bindtextdomain); #endif @@ -283,12 +266,103 @@ #ifdef _INTL_REDIRECT_MACROS # define bind_textdomain_codeset libintl_bind_textdomain_codeset #endif -extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname, - const char *__codeset)) +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. @@ -298,8 +372,8 @@ instead of "/"). */ #define libintl_set_relocation_prefix libintl_set_relocation_prefix extern void - libintl_set_relocation_prefix _INTL_PARAMS ((const char *orig_prefix, - const char *curr_prefix)); + libintl_set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); #ifdef __cplusplus diff -Naur gphoto2-2.1.4/intl/loadinfo.h gphoto2/intl/loadinfo.h --- gphoto2-2.1.4/intl/loadinfo.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/loadinfo.h 2004-10-18 16:09:15.536057526 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -32,14 +32,6 @@ in gettextP.h. */ -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - #ifndef internal_function # define internal_function #endif @@ -89,8 +81,8 @@ names. Normalization allows the user to use any of the common names. The return value is dynamically allocated and has to be freed by the caller. */ -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, - size_t name_len)); +extern const char *_nl_normalize_codeset (const char *codeset, + size_t name_len); /* Lookup a locale dependent file. *L10NFILE_LIST denotes a pool of lookup results of locale dependent @@ -107,19 +99,18 @@ furthermore its ->successor[] field contains a list of other lookup results from which this lookup result inherits. */ extern struct loaded_l10nfile * -_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, int mask, - const char *language, const char *territory, - const char *codeset, - const char *normalized_codeset, - const char *modifier, const char *special, - const char *sponsor, const char *revision, - const char *filename, int do_allocate)); +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, int mask, + const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, const char *special, + const char *sponsor, const char *revision, + const char *filename, int do_allocate); /* Lookup the real locale name for a locale alias NAME, or NULL if NAME is not a locale alias (but possibly a real locale name). The return value is statically allocated and must not be freed. */ -extern const char *_nl_expand_alias PARAMS ((const char *name)); +extern const char *_nl_expand_alias (const char *name); /* Split a locale name NAME into its pieces: language, modifier, territory, codeset, special, sponsor, revision. @@ -139,18 +130,16 @@ CEN_SPONSOR for *SPONSOR, CEN_REVISION for *REVISION. */ -extern int _nl_explode_name PARAMS ((char *name, const char **language, - const char **modifier, - const char **territory, - const char **codeset, - const char **normalized_codeset, - const char **special, - const char **sponsor, - const char **revision)); +extern int _nl_explode_name (char *name, const char **language, + const char **modifier, const char **territory, + const char **codeset, + const char **normalized_codeset, + const char **special, const char **sponsor, + const char **revision); /* Split a locale name NAME into a leading language part and all the rest. Return a pointer to the first character after the language, i.e. to the first byte of the rest. */ -extern char *_nl_find_language PARAMS ((const char *name)); +extern char *_nl_find_language (const char *name); #endif /* loadinfo.h */ diff -Naur gphoto2-2.1.4/intl/loadmsgcat.c gphoto2/intl/loadmsgcat.c --- gphoto2-2.1.4/intl/loadmsgcat.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/loadmsgcat.c 2004-10-18 16:09:15.540056894 +0200 @@ -1,5 +1,5 @@ /* Load needed message catalogs. - Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -491,11 +491,6 @@ #endif -/* Prototypes for local functions. Needed to ensure compiler checking of - function argument counts despite of K&R C function definition syntax. */ -static const char *get_sysdep_segment_value PARAMS ((const char *name)); - - /* We need a sign, whether a new catalog was loaded, which can be associated with all translations. This is important if the translations are cached by one of GCC's features. */ @@ -504,8 +499,7 @@ /* Expand a system dependent string segment. Return NULL if unsupported. */ static const char * -get_sysdep_segment_value (name) - const char *name; +get_sysdep_segment_value (const char *name) { /* Test for an ISO C 99 section 7.8.1 format string directive. Syntax: @@ -754,6 +748,18 @@ } } } + /* 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; } @@ -762,10 +768,9 @@ Return the header entry. */ const char * internal_function -_nl_init_domain_conv (domain_file, domain, domainbinding) - struct loaded_l10nfile *domain_file; - struct loaded_domain *domain; - struct binding *domainbinding; +_nl_init_domain_conv (struct loaded_l10nfile *domain_file, + struct loaded_domain *domain, + struct binding *domainbinding) { /* Find out about the character set the file is encoded with. This can be found (in textual form) in the entry "". If this @@ -829,7 +834,7 @@ outcharset = _NL_CURRENT (LC_CTYPE, CODESET); # else # if HAVE_ICONV - extern const char *locale_charset PARAMS ((void)); + extern const char *locale_charset (void); outcharset = locale_charset (); # endif # endif @@ -881,8 +886,7 @@ /* Frees the codeset dependent parts of an opened message catalog. */ void internal_function -_nl_free_domain_conv (domain) - struct loaded_domain *domain; +_nl_free_domain_conv (struct loaded_domain *domain) { if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) free (domain->conv_tab); @@ -902,9 +906,8 @@ message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file, domainbinding) - struct loaded_l10nfile *domain_file; - struct binding *domainbinding; +_nl_load_domain (struct loaded_l10nfile *domain_file, + struct binding *domainbinding) { int fd; size_t size; @@ -1028,10 +1031,11 @@ /* Fill in the information about the available tables. */ revision = W (domain->must_swap, data->revision); - /* We support only the major revision 0. */ + /* We support only the major revisions 0 and 1. */ switch (revision >> 16) { case 0: + case 1: domain->nstrings = W (domain->must_swap, data->nstrings); domain->orig_tab = (const struct string_desc *) ((char *) data + W (domain->must_swap, data->orig_tab_offset)); @@ -1071,12 +1075,13 @@ const char **sysdep_segment_values; const nls_uint32 *orig_sysdep_tab; const nls_uint32 *trans_sysdep_tab; + nls_uint32 n_inmem_sysdep_strings; size_t memneed; char *mem; struct sysdep_string_desc *inmem_orig_sysdep_tab; struct sysdep_string_desc *inmem_trans_sysdep_tab; nls_uint32 *inmem_hash_tab; - unsigned int i; + unsigned int i, j; /* Get the values of the system dependent segments. */ n_sysdep_segments = @@ -1111,153 +1116,247 @@ + W (domain->must_swap, data->trans_sysdep_tab_offset)); /* Compute the amount of additional memory needed for the - system dependent strings and the augmented hash table. */ - memneed = 2 * n_sysdep_strings - * sizeof (struct sysdep_string_desc) - + domain->hash_size * sizeof (nls_uint32); - for (i = 0; i < 2 * n_sysdep_strings; i++) + system dependent strings and the augmented hash table. + At the same time, also drop string pairs which refer to + an undefined system dependent segment. */ + n_inmem_sysdep_strings = 0; + memneed = domain->hash_size * sizeof (nls_uint32); + for (i = 0; i < n_sysdep_strings; i++) { - const struct sysdep_string *sysdep_string = - (const struct sysdep_string *) - ((char *) data - + W (domain->must_swap, - i < n_sysdep_strings - ? orig_sysdep_tab[i] - : trans_sysdep_tab[i - n_sysdep_strings])); - size_t need = 0; - const struct segment_pair *p = sysdep_string->segments; - - if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END) - for (p = sysdep_string->segments;; p++) - { - nls_uint32 sysdepref; - - need += W (domain->must_swap, p->segsize); - - sysdepref = W (domain->must_swap, p->sysdepref); - if (sysdepref == SEGMENTS_END) - break; + 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 (sysdepref >= n_sysdep_segments) + if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) { - /* Invalid. */ - freea (sysdep_segment_values); - goto invalid; - } + nls_uint32 sysdepref; - need += strlen (sysdep_segment_values[sysdepref]); - } + need += W (domain->must_swap, p->segsize); - memneed += need; - } + sysdepref = W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + 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; + } - /* Allocate additional memory. */ - mem = (char *) malloc (memneed); - if (mem == NULL) - goto invalid; - - domain->malloced = mem; - inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem; - mem += n_sysdep_strings * sizeof (struct sysdep_string_desc); - inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem; - mem += n_sysdep_strings * sizeof (struct sysdep_string_desc); - inmem_hash_tab = (nls_uint32 *) mem; - mem += domain->hash_size * sizeof (nls_uint32); - - /* Compute the system dependent strings. */ - for (i = 0; i < 2 * n_sysdep_strings; i++) - { - const struct sysdep_string *sysdep_string = - (const struct sysdep_string *) - ((char *) data - + W (domain->must_swap, - i < n_sysdep_strings - ? orig_sysdep_tab[i] - : trans_sysdep_tab[i - n_sysdep_strings])); - const char *static_segments = - (char *) data - + W (domain->must_swap, sysdep_string->offset); - const struct segment_pair *p = sysdep_string->segments; + need += strlen (sysdep_segment_values[sysdepref]); + } - /* Concatenate the segments, and fill - inmem_orig_sysdep_tab[i] (for i < n_sysdep_strings) and - inmem_trans_sysdep_tab[i-n_sysdep_strings] (for - i >= n_sysdep_strings). */ + needs[j] = need; + if (!valid) + break; + } - if (W (domain->must_swap, p->sysdepref) == SEGMENTS_END) + if (valid) { - /* Only one static segment. */ - inmem_orig_sysdep_tab[i].length = - W (domain->must_swap, p->segsize); - inmem_orig_sysdep_tab[i].pointer = static_segments; + n_inmem_sysdep_strings++; + memneed += needs[0] + needs[1]; } - else + } + memneed += 2 * n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + + if (n_inmem_sysdep_strings > 0) + { + unsigned int k; + + /* Allocate additional memory. */ + mem = (char *) malloc (memneed); + if (mem == NULL) + goto invalid; + + domain->malloced = mem; + inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem; + mem += n_inmem_sysdep_strings + * sizeof (struct sysdep_string_desc); + inmem_hash_tab = (nls_uint32 *) mem; + mem += domain->hash_size * sizeof (nls_uint32); + + /* Compute the system dependent strings. */ + k = 0; + for (i = 0; i < n_sysdep_strings; i++) { - inmem_orig_sysdep_tab[i].pointer = mem; + int valid = 1; - for (p = sysdep_string->segments;; p++) + for (j = 0; j < 2; j++) { - nls_uint32 segsize = - W (domain->must_swap, p->segsize); - nls_uint32 sysdepref = - W (domain->must_swap, p->sysdepref); - size_t n; + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const struct segment_pair *p = + sysdep_string->segments; + + if (W (domain->must_swap, p->sysdepref) + != SEGMENTS_END) + for (p = sysdep_string->segments;; p++) + { + nls_uint32 sysdepref; + + sysdepref = + W (domain->must_swap, p->sysdepref); + if (sysdepref == SEGMENTS_END) + break; + + if (sysdep_segment_values[sysdepref] == NULL) + { + /* This particular string pair is + invalid. */ + valid = 0; + break; + } + } + + if (!valid) + break; + } - if (segsize > 0) + if (valid) + { + for (j = 0; j < 2; j++) { - memcpy (mem, static_segments, segsize); - mem += segsize; - static_segments += segsize; + const struct sysdep_string *sysdep_string = + (const struct sysdep_string *) + ((char *) data + + W (domain->must_swap, + j == 0 + ? orig_sysdep_tab[i] + : trans_sysdep_tab[i])); + const char *static_segments = + (char *) data + + W (domain->must_swap, sysdep_string->offset); + const struct segment_pair *p = + sysdep_string->segments; + + /* Concatenate the segments, and fill + inmem_orig_sysdep_tab[k] (for j == 0) and + inmem_trans_sysdep_tab[k] (for j == 1). */ + + struct sysdep_string_desc *inmem_tab_entry = + (j == 0 + ? inmem_orig_sysdep_tab + : inmem_trans_sysdep_tab) + + k; + + if (W (domain->must_swap, p->sysdepref) + == SEGMENTS_END) + { + /* Only one static segment. */ + inmem_tab_entry->length = + W (domain->must_swap, p->segsize); + inmem_tab_entry->pointer = static_segments; + } + else + { + inmem_tab_entry->pointer = mem; + + for (p = sysdep_string->segments;; p++) + { + nls_uint32 segsize = + W (domain->must_swap, p->segsize); + nls_uint32 sysdepref = + W (domain->must_swap, p->sysdepref); + size_t n; + + if (segsize > 0) + { + memcpy (mem, static_segments, segsize); + mem += segsize; + static_segments += segsize; + } + + if (sysdepref == SEGMENTS_END) + break; + + n = strlen (sysdep_segment_values[sysdepref]); + memcpy (mem, sysdep_segment_values[sysdepref], n); + mem += n; + } + + inmem_tab_entry->length = + mem - inmem_tab_entry->pointer; + } } - if (sysdepref == SEGMENTS_END) - break; - - n = strlen (sysdep_segment_values[sysdepref]); - memcpy (mem, sysdep_segment_values[sysdepref], n); - mem += n; + k++; } - - inmem_orig_sysdep_tab[i].length = - mem - inmem_orig_sysdep_tab[i].pointer; } - } + 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_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 (;;) + /* Compute the augmented hash table. */ + for (i = 0; i < domain->hash_size; i++) + inmem_hash_tab[i] = + W (domain->must_swap_hash_tab, domain->hash_tab[i]); + for (i = 0; i < n_inmem_sysdep_strings; i++) { - if (inmem_hash_tab[idx] == 0) + const char *msgid = inmem_orig_sysdep_tab[i].pointer; + nls_uint32 hash_val = hash_string (msgid); + nls_uint32 idx = hash_val % domain->hash_size; + nls_uint32 incr = + 1 + (hash_val % (domain->hash_size - 2)); + + for (;;) { - /* Hash table entry is empty. Use it. */ - inmem_hash_tab[idx] = 1 + domain->nstrings + i; - break; - } + if (inmem_hash_tab[idx] == 0) + { + /* Hash table entry is empty. Use it. */ + inmem_hash_tab[idx] = 1 + domain->nstrings + i; + break; + } - if (idx >= domain->hash_size - incr) - idx -= domain->hash_size - incr; - else - idx += incr; + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + } } - } - freea (sysdep_segment_values); + domain->n_sysdep_strings = n_inmem_sysdep_strings; + domain->orig_sysdep_tab = inmem_orig_sysdep_tab; + domain->trans_sysdep_tab = inmem_trans_sysdep_tab; - domain->n_sysdep_strings = n_sysdep_strings; - domain->orig_sysdep_tab = inmem_orig_sysdep_tab; - domain->trans_sysdep_tab = inmem_trans_sysdep_tab; + domain->hash_tab = inmem_hash_tab; + domain->must_swap_hash_tab = 0; + } + else + { + domain->n_sysdep_strings = 0; + domain->orig_sysdep_tab = NULL; + domain->trans_sysdep_tab = NULL; + } - domain->hash_tab = inmem_hash_tab; - domain->must_swap_hash_tab = 0; + freea (sysdep_segment_values); } else { @@ -1299,8 +1398,7 @@ #ifdef _LIBC void internal_function -_nl_unload_domain (domain) - struct loaded_domain *domain; +_nl_unload_domain (struct loaded_domain *domain) { if (domain->plural != &__gettext_germanic_plural) __gettext_free_exp (domain->plural); diff -Naur gphoto2-2.1.4/intl/localcharset.c gphoto2/intl/localcharset.c --- gphoto2-2.1.4/intl/localcharset.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/localcharset.c 2004-10-18 16:09:15.544056261 +0200 @@ -86,7 +86,7 @@ # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) #endif -#ifdef HAVE_GETC_UNLOCKED +#if HAVE_DECL_GETC_UNLOCKED # undef getc # define getc getc_unlocked #endif diff -Naur gphoto2-2.1.4/intl/locale.alias gphoto2/intl/locale.alias --- gphoto2-2.1.4/intl/locale.alias 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/locale.alias 2004-10-18 16:09:15.551055153 +0200 @@ -1,5 +1,5 @@ # Locale name alias data base. -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU Library General Public License as published @@ -29,8 +29,8 @@ # Packages using this file: -bokmal no_NO.ISO-8859-1 -bokml no_NO.ISO-8859-1 +bokmal nb_NO.ISO-8859-1 +bokml nb_NO.ISO-8859-1 catalan ca_ES.ISO-8859-1 croatian hr_HR.ISO-8859-2 czech cs_CZ.ISO-8859-2 @@ -61,9 +61,9 @@ korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR lithuanian lt_LT.ISO-8859-13 -nb_NO no_NO.ISO-8859-1 -nb_NO.ISO-8859-1 no_NO.ISO-8859-1 -norwegian no_NO.ISO-8859-1 +no_NO nb_NO.ISO-8859-1 +no_NO.ISO-8859-1 nb_NO.ISO-8859-1 +norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 portuguese pt_PT.ISO-8859-1 diff -Naur gphoto2-2.1.4/intl/localealias.c gphoto2/intl/localealias.c --- gphoto2-2.1.4/intl/localealias.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/localealias.c 2004-10-18 16:09:15.555054520 +0200 @@ -110,11 +110,11 @@ # define freea(p) free (p) #endif -#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED +#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED # undef fgets # define fgets(buf, len, s) fgets_unlocked (buf, len, s) #endif -#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED +#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED # undef feof # define feof(s) feof_unlocked (s) #endif @@ -140,16 +140,15 @@ /* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) +static size_t read_alias_file (const char *fname, int fname_len) internal_function; -static int extend_alias_table PARAMS ((void)); -static int alias_compare PARAMS ((const struct alias_map *map1, - const struct alias_map *map2)); +static int extend_alias_table (void); +static int alias_compare (const struct alias_map *map1, + const struct alias_map *map2); const char * -_nl_expand_alias (name) - const char *name; +_nl_expand_alias (const char *name) { static const char *locale_alias_path; struct alias_map *retval; @@ -172,8 +171,8 @@ if (nmap > 0) retval = (struct alias_map *) bsearch (&item, map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, - const void *)) + (int (*) (const void *, + const void *) ) alias_compare); else retval = NULL; @@ -215,9 +214,7 @@ static size_t internal_function -read_alias_file (fname, fname_len) - const char *fname; - int fname_len; +read_alias_file (const char *fname, int fname_len) { FILE *fp; char *full_fname; @@ -361,7 +358,7 @@ if (added > 0) qsort (map, nmap, sizeof (struct alias_map), - (int (*) PARAMS ((const void *, const void *))) alias_compare); + (int (*) (const void *, const void *)) alias_compare); return added; } @@ -387,9 +384,7 @@ static int -alias_compare (map1, map2) - const struct alias_map *map1; - const struct alias_map *map2; +alias_compare (const struct alias_map *map1, const struct alias_map *map2) { #if defined _LIBC || defined HAVE_STRCASECMP return strcasecmp (map1->alias, map2->alias); diff -Naur gphoto2-2.1.4/intl/localename.c gphoto2/intl/localename.c --- gphoto2-2.1.4/intl/localename.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/localename.c 2004-10-18 16:09:15.559053887 +0200 @@ -1,5 +1,5 @@ /* Determine the current selected locale. - Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -34,6 +34,124 @@ #ifdef WIN32 # define WIN32_LEAN_AND_MEAN # include +/* List of language codes, sorted by value: + 0x01 LANG_ARABIC + 0x02 LANG_BULGARIAN + 0x03 LANG_CATALAN + 0x04 LANG_CHINESE + 0x05 LANG_CZECH + 0x06 LANG_DANISH + 0x07 LANG_GERMAN + 0x08 LANG_GREEK + 0x09 LANG_ENGLISH + 0x0a LANG_SPANISH + 0x0b LANG_FINNISH + 0x0c LANG_FRENCH + 0x0d LANG_HEBREW + 0x0e LANG_HUNGARIAN + 0x0f LANG_ICELANDIC + 0x10 LANG_ITALIAN + 0x11 LANG_JAPANESE + 0x12 LANG_KOREAN + 0x13 LANG_DUTCH + 0x14 LANG_NORWEGIAN + 0x15 LANG_POLISH + 0x16 LANG_PORTUGUESE + 0x17 LANG_RHAETO_ROMANCE + 0x18 LANG_ROMANIAN + 0x19 LANG_RUSSIAN + 0x1a LANG_CROATIAN == LANG_SERBIAN + 0x1b LANG_SLOVAK + 0x1c LANG_ALBANIAN + 0x1d LANG_SWEDISH + 0x1e LANG_THAI + 0x1f LANG_TURKISH + 0x20 LANG_URDU + 0x21 LANG_INDONESIAN + 0x22 LANG_UKRAINIAN + 0x23 LANG_BELARUSIAN + 0x24 LANG_SLOVENIAN + 0x25 LANG_ESTONIAN + 0x26 LANG_LATVIAN + 0x27 LANG_LITHUANIAN + 0x28 LANG_TAJIK + 0x29 LANG_FARSI + 0x2a LANG_VIETNAMESE + 0x2b LANG_ARMENIAN + 0x2c LANG_AZERI + 0x2d LANG_BASQUE + 0x2e LANG_SORBIAN + 0x2f LANG_MACEDONIAN + 0x30 LANG_SUTU + 0x31 LANG_TSONGA + 0x32 LANG_TSWANA + 0x33 LANG_VENDA + 0x34 LANG_XHOSA + 0x35 LANG_ZULU + 0x36 LANG_AFRIKAANS + 0x37 LANG_GEORGIAN + 0x38 LANG_FAEROESE + 0x39 LANG_HINDI + 0x3a LANG_MALTESE + 0x3b LANG_SAAMI + 0x3c LANG_GAELIC + 0x3d LANG_YIDDISH + 0x3e LANG_MALAY + 0x3f LANG_KAZAK + 0x40 LANG_KYRGYZ + 0x41 LANG_SWAHILI + 0x42 LANG_TURKMEN + 0x43 LANG_UZBEK + 0x44 LANG_TATAR + 0x45 LANG_BENGALI + 0x46 LANG_PUNJABI + 0x47 LANG_GUJARATI + 0x48 LANG_ORIYA + 0x49 LANG_TAMIL + 0x4a LANG_TELUGU + 0x4b LANG_KANNADA + 0x4c LANG_MALAYALAM + 0x4d LANG_ASSAMESE + 0x4e LANG_MARATHI + 0x4f LANG_SANSKRIT + 0x50 LANG_MONGOLIAN + 0x51 LANG_TIBETAN + 0x52 LANG_WELSH + 0x53 LANG_CAMBODIAN + 0x54 LANG_LAO + 0x55 LANG_BURMESE + 0x56 LANG_GALICIAN + 0x57 LANG_KONKANI + 0x58 LANG_MANIPURI + 0x59 LANG_SINDHI + 0x5a LANG_SYRIAC + 0x5b LANG_SINHALESE + 0x5c LANG_CHEROKEE + 0x5d LANG_INUKTITUT + 0x5e LANG_AMHARIC + 0x5f LANG_TAMAZIGHT + 0x60 LANG_KASHMIRI + 0x61 LANG_NEPALI + 0x62 LANG_FRISIAN + 0x63 LANG_PASHTO + 0x64 LANG_TAGALOG + 0x65 LANG_DIVEHI + 0x66 LANG_EDO + 0x67 LANG_FULFULDE + 0x68 LANG_HAUSA + 0x69 LANG_IBIBIO + 0x6a LANG_YORUBA + 0x70 LANG_IGBO + 0x71 LANG_KANURI + 0x72 LANG_OROMO + 0x73 LANG_TIGRINYA + 0x74 LANG_GUARANI + 0x75 LANG_HAWAIIAN + 0x76 LANG_LATIN + 0x77 LANG_SOMALI + 0x78 LANG_YI + 0x79 LANG_PAPIAMENTU +*/ /* Mingw headers don't have latest language and sublanguage codes. */ # ifndef LANG_AFRIKAANS # define LANG_AFRIKAANS 0x36 @@ -41,6 +159,9 @@ # ifndef LANG_ALBANIAN # define LANG_ALBANIAN 0x1c # endif +# ifndef LANG_AMHARIC +# define LANG_AMHARIC 0x5e +# endif # ifndef LANG_ARABIC # define LANG_ARABIC 0x01 # endif @@ -62,12 +183,24 @@ # ifndef LANG_BENGALI # define LANG_BENGALI 0x45 # endif +# ifndef LANG_BURMESE +# define LANG_BURMESE 0x55 +# endif +# ifndef LANG_CAMBODIAN +# define LANG_CAMBODIAN 0x53 +# endif # ifndef LANG_CATALAN # define LANG_CATALAN 0x03 # endif +# ifndef LANG_CHEROKEE +# define LANG_CHEROKEE 0x5c +# endif # ifndef LANG_DIVEHI # define LANG_DIVEHI 0x65 # endif +# ifndef LANG_EDO +# define LANG_EDO 0x66 +# endif # ifndef LANG_ESTONIAN # define LANG_ESTONIAN 0x25 # endif @@ -77,27 +210,57 @@ # ifndef LANG_FARSI # define LANG_FARSI 0x29 # endif +# ifndef LANG_FRISIAN +# define LANG_FRISIAN 0x62 +# endif +# ifndef LANG_FULFULDE +# define LANG_FULFULDE 0x67 +# endif +# ifndef LANG_GAELIC +# define LANG_GAELIC 0x3c +# endif # ifndef LANG_GALICIAN # define LANG_GALICIAN 0x56 # endif # ifndef LANG_GEORGIAN # define LANG_GEORGIAN 0x37 # endif +# ifndef LANG_GUARANI +# define LANG_GUARANI 0x74 +# endif # ifndef LANG_GUJARATI # define LANG_GUJARATI 0x47 # endif +# ifndef LANG_HAUSA +# define LANG_HAUSA 0x68 +# endif +# ifndef LANG_HAWAIIAN +# define LANG_HAWAIIAN 0x75 +# endif # ifndef LANG_HEBREW # define LANG_HEBREW 0x0d # endif # ifndef LANG_HINDI # define LANG_HINDI 0x39 # endif +# ifndef LANG_IBIBIO +# define LANG_IBIBIO 0x69 +# endif +# ifndef LANG_IGBO +# define LANG_IGBO 0x70 +# endif # ifndef LANG_INDONESIAN # define LANG_INDONESIAN 0x21 # endif +# ifndef LANG_INUKTITUT +# define LANG_INUKTITUT 0x5d +# endif # ifndef LANG_KANNADA # define LANG_KANNADA 0x4b # endif +# ifndef LANG_KANURI +# define LANG_KANURI 0x71 +# endif # ifndef LANG_KASHMIRI # define LANG_KASHMIRI 0x60 # endif @@ -110,6 +273,12 @@ # ifndef LANG_KYRGYZ # define LANG_KYRGYZ 0x40 # endif +# ifndef LANG_LAO +# define LANG_LAO 0x54 +# endif +# ifndef LANG_LATIN +# define LANG_LATIN 0x76 +# endif # ifndef LANG_LATVIAN # define LANG_LATVIAN 0x26 # endif @@ -125,6 +294,9 @@ # ifndef LANG_MALAYALAM # define LANG_MALAYALAM 0x4c # endif +# ifndef LANG_MALTESE +# define LANG_MALTESE 0x3a +# endif # ifndef LANG_MANIPURI # define LANG_MANIPURI 0x58 # endif @@ -140,9 +312,24 @@ # ifndef LANG_ORIYA # define LANG_ORIYA 0x48 # endif +# ifndef LANG_OROMO +# define LANG_OROMO 0x72 +# endif +# ifndef LANG_PAPIAMENTU +# define LANG_PAPIAMENTU 0x79 +# endif +# ifndef LANG_PASHTO +# define LANG_PASHTO 0x63 +# endif # ifndef LANG_PUNJABI # define LANG_PUNJABI 0x46 # endif +# ifndef LANG_RHAETO_ROMANCE +# define LANG_RHAETO_ROMANCE 0x17 +# endif +# ifndef LANG_SAAMI +# define LANG_SAAMI 0x3b +# endif # ifndef LANG_SANSKRIT # define LANG_SANSKRIT 0x4f # endif @@ -152,18 +339,36 @@ # ifndef LANG_SINDHI # define LANG_SINDHI 0x59 # endif +# ifndef LANG_SINHALESE +# define LANG_SINHALESE 0x5b +# endif # ifndef LANG_SLOVAK # define LANG_SLOVAK 0x1b # endif +# ifndef LANG_SOMALI +# define LANG_SOMALI 0x77 +# endif # ifndef LANG_SORBIAN # define LANG_SORBIAN 0x2e # endif +# ifndef LANG_SUTU +# define LANG_SUTU 0x30 +# endif # ifndef LANG_SWAHILI # define LANG_SWAHILI 0x41 # endif # ifndef LANG_SYRIAC # define LANG_SYRIAC 0x5a # endif +# ifndef LANG_TAGALOG +# define LANG_TAGALOG 0x64 +# endif +# ifndef LANG_TAJIK +# define LANG_TAJIK 0x28 +# endif +# ifndef LANG_TAMAZIGHT +# define LANG_TAMAZIGHT 0x5f +# endif # ifndef LANG_TAMIL # define LANG_TAMIL 0x49 # endif @@ -176,6 +381,21 @@ # ifndef LANG_THAI # define LANG_THAI 0x1e # endif +# ifndef LANG_TIBETAN +# define LANG_TIBETAN 0x51 +# endif +# ifndef LANG_TIGRINYA +# define LANG_TIGRINYA 0x73 +# endif +# ifndef LANG_TSONGA +# define LANG_TSONGA 0x31 +# endif +# ifndef LANG_TSWANA +# define LANG_TSWANA 0x32 +# endif +# ifndef LANG_TURKMEN +# define LANG_TURKMEN 0x42 +# endif # ifndef LANG_UKRAINIAN # define LANG_UKRAINIAN 0x22 # endif @@ -185,9 +405,30 @@ # ifndef LANG_UZBEK # define LANG_UZBEK 0x43 # endif +# ifndef LANG_VENDA +# define LANG_VENDA 0x33 +# endif # ifndef LANG_VIETNAMESE # define LANG_VIETNAMESE 0x2a # endif +# ifndef LANG_WELSH +# define LANG_WELSH 0x52 +# endif +# ifndef LANG_XHOSA +# define LANG_XHOSA 0x34 +# endif +# ifndef LANG_YI +# define LANG_YI 0x78 +# endif +# ifndef LANG_YIDDISH +# define LANG_YIDDISH 0x3d +# endif +# ifndef LANG_YORUBA +# define LANG_YORUBA 0x6a +# endif +# ifndef LANG_ZULU +# define LANG_ZULU 0x35 +# endif # ifndef SUBLANG_ARABIC_SAUDI_ARABIA # define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 # endif @@ -242,6 +483,12 @@ # ifndef SUBLANG_AZERI_CYRILLIC # define SUBLANG_AZERI_CYRILLIC 0x02 # endif +# ifndef SUBLANG_BENGALI_INDIA +# define SUBLANG_BENGALI_INDIA 0x00 +# endif +# ifndef SUBLANG_BENGALI_BANGLADESH +# define SUBLANG_BENGALI_BANGLADESH 0x01 +# endif # ifndef SUBLANG_CHINESE_MACAU # define SUBLANG_CHINESE_MACAU 0x05 # endif @@ -266,12 +513,54 @@ # ifndef SUBLANG_ENGLISH_PHILIPPINES # define SUBLANG_ENGLISH_PHILIPPINES 0x0d # endif +# ifndef SUBLANG_ENGLISH_INDONESIA +# define SUBLANG_ENGLISH_INDONESIA 0x0e +# endif +# ifndef SUBLANG_ENGLISH_HONGKONG +# define SUBLANG_ENGLISH_HONGKONG 0x0f +# endif +# ifndef SUBLANG_ENGLISH_INDIA +# define SUBLANG_ENGLISH_INDIA 0x10 +# endif +# ifndef SUBLANG_ENGLISH_MALAYSIA +# define SUBLANG_ENGLISH_MALAYSIA 0x11 +# endif +# ifndef SUBLANG_ENGLISH_SINGAPORE +# define SUBLANG_ENGLISH_SINGAPORE 0x12 +# endif # ifndef SUBLANG_FRENCH_LUXEMBOURG # define SUBLANG_FRENCH_LUXEMBOURG 0x05 # endif # ifndef SUBLANG_FRENCH_MONACO # define SUBLANG_FRENCH_MONACO 0x06 # endif +# ifndef SUBLANG_FRENCH_WESTINDIES +# define SUBLANG_FRENCH_WESTINDIES 0x07 +# endif +# ifndef SUBLANG_FRENCH_REUNION +# define SUBLANG_FRENCH_REUNION 0x08 +# endif +# ifndef SUBLANG_FRENCH_CONGO +# define SUBLANG_FRENCH_CONGO 0x09 +# endif +# ifndef SUBLANG_FRENCH_SENEGAL +# define SUBLANG_FRENCH_SENEGAL 0x0a +# endif +# ifndef SUBLANG_FRENCH_CAMEROON +# define SUBLANG_FRENCH_CAMEROON 0x0b +# endif +# ifndef SUBLANG_FRENCH_COTEDIVOIRE +# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c +# endif +# ifndef SUBLANG_FRENCH_MALI +# define SUBLANG_FRENCH_MALI 0x0d +# endif +# ifndef SUBLANG_FRENCH_MOROCCO +# define SUBLANG_FRENCH_MOROCCO 0x0e +# endif +# ifndef SUBLANG_FRENCH_HAITI +# define SUBLANG_FRENCH_HAITI 0x0f +# endif # ifndef SUBLANG_GERMAN_LUXEMBOURG # define SUBLANG_GERMAN_LUXEMBOURG 0x04 # endif @@ -290,12 +579,30 @@ # ifndef SUBLANG_NEPALI_INDIA # define SUBLANG_NEPALI_INDIA 0x02 # endif +# ifndef SUBLANG_PUNJABI_INDIA +# define SUBLANG_PUNJABI_INDIA 0x00 +# endif +# ifndef SUBLANG_PUNJABI_PAKISTAN +# define SUBLANG_PUNJABI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_ROMANIAN_ROMANIA +# define SUBLANG_ROMANIAN_ROMANIA 0x00 +# endif +# ifndef SUBLANG_ROMANIAN_MOLDOVA +# define SUBLANG_ROMANIAN_MOLDOVA 0x01 +# endif # ifndef SUBLANG_SERBIAN_LATIN # define SUBLANG_SERBIAN_LATIN 0x02 # endif # ifndef SUBLANG_SERBIAN_CYRILLIC # define SUBLANG_SERBIAN_CYRILLIC 0x03 # endif +# ifndef SUBLANG_SINDHI_INDIA +# define SUBLANG_SINDHI_INDIA 0x00 +# endif +# ifndef SUBLANG_SINDHI_PAKISTAN +# define SUBLANG_SINDHI_PAKISTAN 0x01 +# endif # ifndef SUBLANG_SPANISH_GUATEMALA # define SUBLANG_SPANISH_GUATEMALA 0x04 # endif @@ -350,6 +657,18 @@ # ifndef SUBLANG_SWEDISH_FINLAND # define SUBLANG_SWEDISH_FINLAND 0x02 # endif +# ifndef SUBLANG_TAMAZIGHT_ARABIC +# define SUBLANG_TAMAZIGHT_ARABIC 0x01 +# endif +# ifndef SUBLANG_TAMAZIGHT_LATIN +# define SUBLANG_TAMAZIGHT_LATIN 0x02 +# endif +# ifndef SUBLANG_TIGRINYA_ETHIOPIA +# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 +# endif +# ifndef SUBLANG_TIGRINYA_ERITREA +# define SUBLANG_TIGRINYA_ERITREA 0x01 +# endif # ifndef SUBLANG_URDU_PAKISTAN # define SUBLANG_URDU_PAKISTAN 0x01 # endif @@ -381,9 +700,7 @@ The result must not be freed; it is statically allocated. */ const char * -_nl_locale_name (category, categoryname) - int category; - const char *categoryname; +_nl_locale_name (int category, const char *categoryname) { const char *retval; @@ -454,7 +771,7 @@ { case LANG_AFRIKAANS: return "af_ZA"; case LANG_ALBANIAN: return "sq_AL"; - case 0x5e: /* AMHARIC */ return "am_ET"; + case LANG_AMHARIC: return "am_ET"; case LANG_ARABIC: switch (sub) { @@ -489,12 +806,18 @@ case LANG_BASQUE: return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */ case LANG_BELARUSIAN: return "be_BY"; - case LANG_BENGALI: return "bn_IN"; + case LANG_BENGALI: + switch (sub) + { + case SUBLANG_BENGALI_INDIA: return "bn_IN"; + case SUBLANG_BENGALI_BANGLADESH: return "bn_BD"; + } + return "bn"; case LANG_BULGARIAN: return "bg_BG"; - case 0x55: /* BURMESE */ return "my_MM"; - case 0x53: /* CAMBODIAN */ return "km_KH"; + case LANG_BURMESE: return "my_MM"; + case LANG_CAMBODIAN: return "km_KH"; case LANG_CATALAN: return "ca_ES"; - case 0x5c: /* CHEROKEE */ return "chr_US"; + case LANG_CHEROKEE: return "chr_US"; case LANG_CHINESE: switch (sub) { @@ -516,13 +839,13 @@ switch (sub) { case SUBLANG_DEFAULT: return "hr_HR"; - case SUBLANG_SERBIAN_LATIN: return "sr_YU"; - case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic"; + case SUBLANG_SERBIAN_LATIN: return "sr_CS"; + case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic"; } return "hr"; case LANG_CZECH: return "cs_CZ"; case LANG_DANISH: return "da_DK"; - case LANG_DIVEHI: return "div_MV"; + case LANG_DIVEHI: return "dv_MV"; case LANG_DUTCH: switch (sub) { @@ -530,7 +853,7 @@ case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE"; } return "nl"; - case 0x66: /* EDO */ return "bin_NG"; + case LANG_EDO: return "bin_NG"; case LANG_ENGLISH: switch (sub) { @@ -551,6 +874,11 @@ case SUBLANG_ENGLISH_TRINIDAD: return "en_TT"; case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW"; case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH"; + case SUBLANG_ENGLISH_INDONESIA: return "en_ID"; + case SUBLANG_ENGLISH_HONGKONG: return "en_HK"; + case SUBLANG_ENGLISH_INDIA: return "en_IN"; + case SUBLANG_ENGLISH_MALAYSIA: return "en_MY"; + case SUBLANG_ENGLISH_SINGAPORE: return "en_SG"; } return "en"; case LANG_ESTONIAN: return "et_EE"; @@ -566,11 +894,22 @@ case SUBLANG_FRENCH_SWISS: return "fr_CH"; case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU"; case SUBLANG_FRENCH_MONACO: return "fr_MC"; + case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */ + case SUBLANG_FRENCH_REUNION: return "fr_RE"; + case SUBLANG_FRENCH_CONGO: return "fr_CG"; + case SUBLANG_FRENCH_SENEGAL: return "fr_SN"; + case SUBLANG_FRENCH_CAMEROON: return "fr_CM"; + case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI"; + case SUBLANG_FRENCH_MALI: return "fr_ML"; + case SUBLANG_FRENCH_MOROCCO: return "fr_MA"; + case SUBLANG_FRENCH_HAITI: return "fr_HT"; } return "fr"; - case 0x62: /* FRISIAN */ return "fy_NL"; - case 0x67: /* FULFULDE */ return "ful_NG"; - case 0x3c: /* GAELIC */ + case LANG_FRISIAN: return "fy_NL"; + case LANG_FULFULDE: + /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */ + return "ff_NG"; + case LANG_GAELIC: switch (sub) { case 0x01: /* SCOTTISH */ return "gd_GB"; @@ -590,21 +929,21 @@ } return "de"; case LANG_GREEK: return "el_GR"; - case 0x74: /* GUARANI */ return "gn_PY"; + case LANG_GUARANI: return "gn_PY"; case LANG_GUJARATI: return "gu_IN"; - case 0x68: /* HAUSA */ return "ha_NG"; - case 0x75: /* HAWAIIAN */ + case LANG_HAUSA: return "ha_NG"; + case LANG_HAWAIIAN: /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers) or Hawaii Creole English ("cpe_US", 600000 speakers)? */ return "cpe_US"; case LANG_HEBREW: return "he_IL"; case LANG_HINDI: return "hi_IN"; case LANG_HUNGARIAN: return "hu_HU"; - case 0x69: /* IBIBIO */ return "nic_NG"; + case LANG_IBIBIO: return "nic_NG"; case LANG_ICELANDIC: return "is_IS"; - case 0x70: /* IGBO */ return "ibo_NG"; + case LANG_IGBO: return "ig_NG"; case LANG_INDONESIAN: return "id_ID"; - case 0x5d: /* INUKTITUT */ return "iu_CA"; + case LANG_INUKTITUT: return "iu_CA"; case LANG_ITALIAN: switch (sub) { @@ -614,7 +953,7 @@ return "it"; case LANG_JAPANESE: return "ja_JP"; case LANG_KANNADA: return "kn_IN"; - case 0x71: /* KANURI */ return "kau_NG"; + case LANG_KANURI: return "kr_NG"; case LANG_KASHMIRI: switch (sub) { @@ -628,8 +967,8 @@ return "kok_IN"; case LANG_KOREAN: return "ko_KR"; case LANG_KYRGYZ: return "ky_KG"; - case 0x54: /* LAO */ return "lo_LA"; - case 0x76: /* LATIN */ return "la_VA"; + case LANG_LAO: return "lo_LA"; + case LANG_LATIN: return "la_VA"; case LANG_LATVIAN: return "lv_LV"; case LANG_LITHUANIAN: return "lt_LT"; case LANG_MACEDONIAN: return "mk_MK"; @@ -641,7 +980,7 @@ } return "ms"; case LANG_MALAYALAM: return "ml_IN"; - case 0x3a: /* MALTESE */ return "mt_MT"; + case LANG_MALTESE: return "mt_MT"; case LANG_MANIPURI: /* FIXME: Adjust this when such locales appear on Unix. */ return "mni_IN"; @@ -663,9 +1002,9 @@ } return "no"; case LANG_ORIYA: return "or_IN"; - case 0x72: /* OROMO */ return "om_ET"; - case 0x79: /* PAPIAMENTU */ return "pap_AN"; - case 0x63: /* PASHTO */ + case LANG_OROMO: return "om_ET"; + case LANG_PAPIAMENTU: return "pap_AN"; + case LANG_PASHTO: return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */ case LANG_POLISH: return "pl_PL"; case LANG_PORTUGUESE: @@ -677,18 +1016,36 @@ case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR"; } return "pt"; - case LANG_PUNJABI: return "pa_IN"; - case 0x17: /* RHAETO-ROMANCE */ return "rm_CH"; - case LANG_ROMANIAN: return "ro_RO"; + case LANG_PUNJABI: + switch (sub) + { + case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */ + case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */ + } + return "pa"; + case LANG_RHAETO_ROMANCE: return "rm_CH"; + case LANG_ROMANIAN: + switch (sub) + { + case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO"; + case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD"; + } + return "ro"; case LANG_RUSSIAN: - return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA". */ - case 0x3b: /* SAMI */ return "se_NO"; + return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */ + case LANG_SAAMI: /* actually Northern Sami */ return "se_NO"; case LANG_SANSKRIT: return "sa_IN"; - case LANG_SINDHI: return "sd"; - case 0x5b: /* SINHALESE */ return "si_LK"; + case LANG_SINDHI: + switch (sub) + { + case SUBLANG_SINDHI_INDIA: return "sd_IN"; + case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; + } + return "sd"; + case LANG_SINHALESE: return "si_LK"; case LANG_SLOVAK: return "sk_SK"; case LANG_SLOVENIAN: return "sl_SI"; - case 0x77: /* SOMALI */ return "so_SO"; + case LANG_SOMALI: return "so_SO"; case LANG_SORBIAN: /* FIXME: Adjust this when such locales appear on Unix. */ return "wen_DE"; @@ -718,7 +1075,7 @@ case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR"; } return "es"; - case 0x30: /* SUTU */ return "bnt_TZ"; + case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */ case LANG_SWAHILI: return "sw_KE"; case LANG_SWEDISH: switch (sub) @@ -728,19 +1085,33 @@ } return "sv"; case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */ - case 0x64: /* TAGALOG */ return "tl_PH"; - case 0x28: /* TAJIK */ return "tg_TJ"; - case 0x5f: /* TAMAZIGHT */ return "ber_MA"; + case LANG_TAGALOG: return "tl_PH"; + case LANG_TAJIK: return "tg_TJ"; + case LANG_TAMAZIGHT: + switch (sub) + { + /* FIXME: Adjust this when Tamazight locales appear on Unix. */ + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; + case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; + } + return "ber_MA"; case LANG_TAMIL: return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */ case LANG_TATAR: return "tt_RU"; case LANG_TELUGU: return "te_IN"; case LANG_THAI: return "th_TH"; - case 0x51: /* TIBETAN */ return "bo_CN"; - case 0x73: /* TIGRINYA */ return "ti_ET"; - case 0x31: /* TSONGA */ return "ts_ZA"; + case LANG_TIBETAN: return "bo_CN"; + case LANG_TIGRINYA: + switch (sub) + { + case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET"; + case SUBLANG_TIGRINYA_ERITREA: return "ti_ER"; + } + return "ti"; + case LANG_TSONGA: return "ts_ZA"; + case LANG_TSWANA: return "tn_BW"; case LANG_TURKISH: return "tr_TR"; - case 0x42: /* TURKMEN */ return "tk_TM"; + case LANG_TURKMEN: return "tk_TM"; case LANG_UKRAINIAN: return "uk_UA"; case LANG_URDU: switch (sub) @@ -752,19 +1123,18 @@ case LANG_UZBEK: switch (sub) { - /* FIXME: Adjust this when Uzbek locales appear on Unix. */ - case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin"; + case SUBLANG_UZBEK_LATIN: return "uz_UZ"; case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic"; } return "uz"; - case 0x33: /* VENDA */ return "ven_ZA"; + case LANG_VENDA: return "ve_ZA"; case LANG_VIETNAMESE: return "vi_VN"; - case 0x52: /* WELSH */ return "cy_GB"; - case 0x34: /* XHOSA */ return "xh_ZA"; - case 0x78: /* YI */ return "sit_CN"; - case 0x3d: /* YIDDISH */ return "yi_IL"; - case 0x6a: /* YORUBA */ return "yo_NG"; - case 0x35: /* ZULU */ return "zu_ZA"; + case LANG_WELSH: return "cy_GB"; + case LANG_XHOSA: return "xh_ZA"; + case LANG_YI: return "sit_CN"; + case LANG_YIDDISH: return "yi_IL"; + case LANG_YORUBA: return "yo_NG"; + case LANG_ZULU: return "zu_ZA"; default: return "C"; } diff -Naur gphoto2-2.1.4/intl/log.c gphoto2/intl/log.c --- gphoto2-2.1.4/intl/log.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/log.c 2004-10-18 16:09:15.563053255 +0200 @@ -28,9 +28,7 @@ /* Print an ASCII string with quotes and escape sequences where needed. */ static void -print_escaped (stream, str) - FILE *stream; - const char *str; +print_escaped (FILE *stream, const char *str) { putc ('"', stream); for (; *str != '\0'; str++) @@ -52,12 +50,8 @@ /* Add to the log file an entry denoting a failed translation. */ void -_nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural) - const char *logfilename; - const char *domainname; - const char *msgid1; - const char *msgid2; - int plural; +_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; diff -Naur gphoto2-2.1.4/intl/Makefile.in gphoto2/intl/Makefile.in --- gphoto2-2.1.4/intl/Makefile.in 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/Makefile.in 2004-10-18 16:09:15.566052780 +0200 @@ -73,6 +73,10 @@ 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 = \ @@ -96,6 +100,7 @@ relocatable.c \ localename.c \ log.c \ + printf.c \ osdep.c \ os2compat.c \ intl-compat.c @@ -120,6 +125,7 @@ relocatable.$lo \ localename.$lo \ log.$lo \ + printf.$lo \ osdep.$lo \ intl-compat.$lo DISTFILES.common = Makefile.in \ @@ -127,7 +133,8 @@ DISTFILES.generated = plural.c DISTFILES.normal = VERSION DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \ -Makefile.vms libgnuintl.h.msvc-shared README.woe32 Makefile.msvc +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 @@ -155,9 +162,9 @@ # 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=5 +LTV_CURRENT=7 LTV_REVISION=0 -LTV_AGE=3 +LTV_AGE=4 .SUFFIXES: .SUFFIXES: .c .y .o .lo .sin .sed @@ -209,6 +216,8 @@ $(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 @@ -224,7 +233,11 @@ INCLUDES = -I. -I$(srcdir) -I.. libgnuintl.h: $(srcdir)/libgnuintl.h.in - cp $(srcdir)/libgnuintl.h.in libgnuintl.h + 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 @@ -250,7 +263,7 @@ $(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 \ + if test -n "$$dependencies"; then \ rm -f $(DESTDIR)$(libdir)/libintl.la; \ fi; \ fi; \ @@ -412,6 +425,7 @@ 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 diff -Naur gphoto2-2.1.4/intl/ngettext.c gphoto2/intl/ngettext.c --- gphoto2-2.1.4/intl/ngettext.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/ngettext.c 2004-10-18 16:09:15.570052147 +0200 @@ -1,5 +1,5 @@ /* Implementation of ngettext(3) function. - Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -54,10 +54,7 @@ LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -NGETTEXT (msgid1, msgid2, n) - const char *msgid1; - const char *msgid2; - unsigned long int n; +NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n) { return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); } diff -Naur gphoto2-2.1.4/intl/plural.c gphoto2/intl/plural.c --- gphoto2-2.1.4/intl/plural.c 2004-01-18 21:01:12.000000000 +0100 +++ gphoto2/intl/plural.c 2004-10-18 16:09:17.614728587 +0200 @@ -19,7 +19,7 @@ #line 1 "plural.y" /* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -75,28 +75,13 @@ #line 55 "plural.y" /* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; +new_exp (int nargs, enum operator op, struct expression * const *args) { int i; struct expression *newp; @@ -125,16 +110,13 @@ } static inline struct expression * -new_exp_0 (op) - enum operator op; +new_exp_0 (enum operator op) { return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; +new_exp_1 (enum operator op, struct expression *right) { struct expression *args[1]; @@ -143,10 +125,7 @@ } static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; +new_exp_2 (enum operator op, struct expression *left, struct expression *right) { struct expression *args[2]; @@ -156,11 +135,8 @@ } static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) { struct expression *args[3]; @@ -236,8 +212,8 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 174, 182, 186, 190, 194, 198, 202, 206, 210, - 214, 218, 223 + 0, 150, 158, 162, 166, 170, 174, 178, 182, 186, + 190, 194, 199 }; #endif @@ -1027,7 +1003,7 @@ switch (yyn) { case 1: -#line 175 "plural.y" +#line 151 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; @@ -1035,68 +1011,68 @@ } break; case 2: -#line 183 "plural.y" +#line 159 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); } break; case 3: -#line 187 "plural.y" +#line 163 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); } break; case 4: -#line 191 "plural.y" +#line 167 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); } break; case 5: -#line 195 "plural.y" +#line 171 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 6: -#line 199 "plural.y" +#line 175 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 7: -#line 203 "plural.y" +#line 179 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 8: -#line 207 "plural.y" +#line 183 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); } break; case 9: -#line 211 "plural.y" +#line 187 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); } break; case 10: -#line 215 "plural.y" +#line 191 "plural.y" { yyval.exp = new_exp_0 (var); } break; case 11: -#line 219 "plural.y" +#line 195 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; } break; case 12: -#line 224 "plural.y" +#line 200 "plural.y" { yyval.exp = yyvsp[-1].exp; } @@ -1334,13 +1310,12 @@ #endif return yyresult; } -#line 229 "plural.y" +#line 205 "plural.y" void internal_function -FREE_EXPRESSION (exp) - struct expression *exp; +FREE_EXPRESSION (struct expression *exp) { if (exp == NULL) return; @@ -1366,9 +1341,7 @@ static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; +yylex (YYSTYPE *lval, const char **pexp) { const char *exp = *pexp; int result; @@ -1511,8 +1484,7 @@ static void -yyerror (str) - const char *str; +yyerror (const char *str) { /* Do nothing. We don't print error messages here. */ } diff -Naur gphoto2-2.1.4/intl/plural-exp.c gphoto2/intl/plural-exp.c --- gphoto2-2.1.4/intl/plural-exp.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/plural-exp.c 2004-10-18 16:09:15.602047084 +0200 @@ -1,5 +1,5 @@ /* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -96,10 +96,8 @@ void internal_function -EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp) - const char *nullentry; - struct expression **pluralp; - unsigned long int *npluralsp; +EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp, + unsigned long int *npluralsp) { if (nullentry != NULL) { diff -Naur gphoto2-2.1.4/intl/plural-exp.h gphoto2/intl/plural-exp.h --- gphoto2-2.1.4/intl/plural-exp.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/plural-exp.h 2004-10-18 16:09:15.606046451 +0200 @@ -1,5 +1,5 @@ /* Expression parsing and evaluation for plural form selection. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000-2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -20,14 +20,6 @@ #ifndef _PLURAL_EXP_H #define _PLURAL_EXP_H -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - #ifndef internal_function # define internal_function #endif @@ -109,18 +101,18 @@ # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression #endif -extern void FREE_EXPRESSION PARAMS ((struct expression *exp)) +extern void FREE_EXPRESSION (struct expression *exp) internal_function; -extern int PLURAL_PARSE PARAMS ((void *arg)); +extern int PLURAL_PARSE (void *arg); extern struct expression GERMANIC_PLURAL attribute_hidden; -extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry, - struct expression **pluralp, - unsigned long int *npluralsp)) +extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, + struct expression **pluralp, + unsigned long int *npluralsp) internal_function; #if !defined (_LIBC) && !defined (IN_LIBINTL) -extern unsigned long int plural_eval PARAMS ((struct expression *pexp, - unsigned long int n)); +extern unsigned long int plural_eval (struct expression *pexp, + unsigned long int n); #endif #endif /* _PLURAL_EXP_H */ diff -Naur gphoto2-2.1.4/intl/plural.y gphoto2/intl/plural.y --- gphoto2-2.1.4/intl/plural.y 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/plural.y 2004-10-18 16:09:15.610045818 +0200 @@ -1,6 +1,6 @@ %{ /* Expression parsing for plural form selection. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc. Written by Ulrich Drepper , 2000. This program is free software; you can redistribute it and/or modify it @@ -54,28 +54,13 @@ %{ /* Prototypes for local functions. */ -static struct expression *new_exp PARAMS ((int nargs, enum operator op, - struct expression * const *args)); -static inline struct expression *new_exp_0 PARAMS ((enum operator op)); -static inline struct expression *new_exp_1 PARAMS ((enum operator op, - struct expression *right)); -static struct expression *new_exp_2 PARAMS ((enum operator op, - struct expression *left, - struct expression *right)); -static inline struct expression *new_exp_3 PARAMS ((enum operator op, - struct expression *bexp, - struct expression *tbranch, - struct expression *fbranch)); -static int yylex PARAMS ((YYSTYPE *lval, const char **pexp)); -static void yyerror PARAMS ((const char *str)); +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp (nargs, op, args) - int nargs; - enum operator op; - struct expression * const *args; +new_exp (int nargs, enum operator op, struct expression * const *args) { int i; struct expression *newp; @@ -104,16 +89,13 @@ } static inline struct expression * -new_exp_0 (op) - enum operator op; +new_exp_0 (enum operator op) { return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1 (op, right) - enum operator op; - struct expression *right; +new_exp_1 (enum operator op, struct expression *right) { struct expression *args[1]; @@ -122,10 +104,7 @@ } static struct expression * -new_exp_2 (op, left, right) - enum operator op; - struct expression *left; - struct expression *right; +new_exp_2 (enum operator op, struct expression *left, struct expression *right) { struct expression *args[2]; @@ -135,11 +114,8 @@ } static inline struct expression * -new_exp_3 (op, bexp, tbranch, fbranch) - enum operator op; - struct expression *bexp; - struct expression *tbranch; - struct expression *fbranch; +new_exp_3 (enum operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) { struct expression *args[3]; @@ -230,8 +206,7 @@ void internal_function -FREE_EXPRESSION (exp) - struct expression *exp; +FREE_EXPRESSION (struct expression *exp) { if (exp == NULL) return; @@ -257,9 +232,7 @@ static int -yylex (lval, pexp) - YYSTYPE *lval; - const char **pexp; +yylex (YYSTYPE *lval, const char **pexp) { const char *exp = *pexp; int result; @@ -402,8 +375,7 @@ static void -yyerror (str) - const char *str; +yyerror (const char *str) { /* Do nothing. We don't print error messages here. */ } diff -Naur gphoto2-2.1.4/intl/printf-args.c gphoto2/intl/printf-args.c --- gphoto2-2.1.4/intl/printf-args.c 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/printf-args.c 2004-10-18 16:09:15.614045185 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/printf-args.h gphoto2/intl/printf-args.h --- gphoto2-2.1.4/intl/printf-args.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/printf-args.h 2004-10-18 16:09:15.617044711 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/printf.c gphoto2/intl/printf.c --- gphoto2-2.1.4/intl/printf.c 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/printf.c 2004-10-18 16:09:15.621044078 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/printf-parse.c gphoto2/intl/printf-parse.c --- gphoto2-2.1.4/intl/printf-parse.c 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/printf-parse.c 2004-10-18 16:09:15.624043603 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/printf-parse.h gphoto2/intl/printf-parse.h --- gphoto2-2.1.4/intl/printf-parse.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/printf-parse.h 2004-10-18 16:09:15.631042496 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/relocatable.c gphoto2/intl/relocatable.c --- gphoto2-2.1.4/intl/relocatable.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/relocatable.c 2004-10-18 16:09:15.643040597 +0200 @@ -42,7 +42,12 @@ #ifdef NO_XMALLOC # define xmalloc malloc #else -# include "xmalloc.h" +# include "xalloc.h" +#endif + +#if defined _WIN32 || defined __WIN32__ +# define WIN32_LEAN_AND_MEAN +# include #endif #if DEPENDS_ON_LIBCHARSET @@ -152,6 +157,8 @@ #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 @@ -266,6 +273,8 @@ } } +#endif /* !IN_LIBRARY || PIC */ + #if defined PIC && defined INSTALLDIR /* Full pathname of shared library, or NULL. */ @@ -304,7 +313,8 @@ static void find_shared_library_fullname () { -#ifdef __linux__ +#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. */ diff -Naur gphoto2-2.1.4/intl/relocatable.h gphoto2/intl/relocatable.h --- gphoto2-2.1.4/intl/relocatable.h 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/relocatable.h 2004-10-18 16:09:15.647039964 +0200 @@ -20,6 +20,11 @@ #ifndef _RELOCATABLE_H #define _RELOCATABLE_H +#ifdef __cplusplus +extern "C" { +#endif + + /* This can be enabled through the configure --enable-relocatable option. */ #if ENABLE_RELOCATABLE @@ -64,4 +69,9 @@ #endif + +#ifdef __cplusplus +} +#endif + #endif /* _RELOCATABLE_H */ diff -Naur gphoto2-2.1.4/intl/textdomain.c gphoto2/intl/textdomain.c --- gphoto2-2.1.4/intl/textdomain.c 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/textdomain.c 2004-10-18 16:09:15.650039489 +0200 @@ -1,5 +1,5 @@ /* Implementation of the textdomain(3) function. - Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -77,8 +77,7 @@ If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */ char * -TEXTDOMAIN (domainname) - const char *domainname; +TEXTDOMAIN (const char *domainname) { char *new_domain; char *old_domain; diff -Naur gphoto2-2.1.4/intl/vasnprintf.c gphoto2/intl/vasnprintf.c --- gphoto2-2.1.4/intl/vasnprintf.c 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/vasnprintf.c 2004-10-18 16:09:15.656038540 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/vasnprintf.h gphoto2/intl/vasnprintf.h --- gphoto2-2.1.4/intl/vasnprintf.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/vasnprintf.h 2004-10-18 16:09:15.660037907 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/vasnwprintf.h gphoto2/intl/vasnwprintf.h --- gphoto2-2.1.4/intl/vasnwprintf.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/vasnwprintf.h 2004-10-18 16:09:15.663037433 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/VERSION gphoto2/intl/VERSION --- gphoto2-2.1.4/intl/VERSION 2003-10-08 17:27:00.000000000 +0200 +++ gphoto2/intl/VERSION 2004-10-18 16:09:15.667036800 +0200 @@ -1 +1 @@ -GNU gettext library from gettext-0.12.1 +GNU gettext library from gettext-0.14.1 diff -Naur gphoto2-2.1.4/intl/wprintf-parse.h gphoto2/intl/wprintf-parse.h --- gphoto2-2.1.4/intl/wprintf-parse.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/wprintf-parse.h 2004-10-18 16:09:15.671036167 +0200 @@ -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 -Naur gphoto2-2.1.4/intl/xsize.h gphoto2/intl/xsize.h --- gphoto2-2.1.4/intl/xsize.h 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/intl/xsize.h 2004-10-18 16:09:15.674035692 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/ChangeLog gphoto2/m4/ChangeLog --- gphoto2-2.1.4/m4/ChangeLog 2004-01-18 21:01:11.000000000 +0100 +++ gphoto2/m4/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -2004-01-18 gettextize - - * codeset.m4: New file, from gettext-0.12.1. - * gettext.m4: New file, from gettext-0.12.1. - * glibc21.m4: New file, from gettext-0.12.1. - * iconv.m4: New file, from gettext-0.12.1. - * intdiv0.m4: New file, from gettext-0.12.1. - * inttypes.m4: New file, from gettext-0.12.1. - * inttypes_h.m4: New file, from gettext-0.12.1. - * inttypes-pri.m4: New file, from gettext-0.12.1. - * isc-posix.m4: New file, from gettext-0.12.1. - * lcmessage.m4: New file, from gettext-0.12.1. - * lib-ld.m4: New file, from gettext-0.12.1. - * lib-link.m4: New file, from gettext-0.12.1. - * lib-prefix.m4: New file, from gettext-0.12.1. - * nls.m4: New file, from gettext-0.12.1. - * po.m4: New file, from gettext-0.12.1. - * progtest.m4: New file, from gettext-0.12.1. - * stdint_h.m4: New file, from gettext-0.12.1. - * uintmax_t.m4: New file, from gettext-0.12.1. - * ulonglong.m4: New file, from gettext-0.12.1. - * Makefile.am: New file. - diff -Naur gphoto2-2.1.4/m4/gettext.m4 gphoto2/m4/gettext.m4 --- gphoto2-2.1.4/m4/gettext.m4 2003-10-08 17:30:49.000000000 +0200 +++ gphoto2/m4/gettext.m4 2004-10-18 16:09:15.747024142 +0200 @@ -1,4 +1,4 @@ -# gettext.m4 serial 20 (gettext-0.12) +# 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 @@ -354,9 +354,18 @@ 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 @@ -364,14 +373,57 @@ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl + AC_REQUIRE([gl_XSIZE])dnl + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], + [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) + ]) AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ + AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ +mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ +strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ __fsetlocking]) + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). + gt_CHECK_DECL(_snprintf, [#include ]) + 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 @@ -411,5 +463,25 @@ ]) +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 -Naur gphoto2-2.1.4/m4/intmax.m4 gphoto2/m4/intmax.m4 --- gphoto2-2.1.4/m4/intmax.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/intmax.m4 2004-10-18 16:09:15.764021452 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/lib-ld.m4 gphoto2/m4/lib-ld.m4 --- gphoto2-2.1.4/m4/lib-ld.m4 2003-10-08 17:30:49.000000000 +0200 +++ gphoto2/m4/lib-ld.m4 2004-10-18 16:09:15.785018130 +0200 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 2 (gettext-0.12) +# 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 @@ -14,11 +14,12 @@ AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi]) +case `$LD -v 2>&1 &1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac fi done IFS="$ac_save_ifs" diff -Naur gphoto2-2.1.4/m4/lib-prefix.m4 gphoto2/m4/lib-prefix.m4 --- gphoto2-2.1.4/m4/lib-prefix.m4 2003-10-08 17:30:49.000000000 +0200 +++ gphoto2/m4/lib-prefix.m4 2004-10-18 16:09:15.792017022 +0200 @@ -1,4 +1,4 @@ -# lib-prefix.m4 serial 2 (gettext-0.12) +# 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 @@ -13,7 +13,7 @@ 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])])]) +[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 diff -Naur gphoto2-2.1.4/m4/longdouble.m4 gphoto2/m4/longdouble.m4 --- gphoto2-2.1.4/m4/longdouble.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/longdouble.m4 2004-10-18 16:09:15.796016389 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/longlong.m4 gphoto2/m4/longlong.m4 --- gphoto2-2.1.4/m4/longlong.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/longlong.m4 2004-10-18 16:09:15.800015756 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/Makefile.am gphoto2/m4/Makefile.am --- gphoto2-2.1.4/m4/Makefile.am 2004-01-18 21:01:11.000000000 +0100 +++ gphoto2/m4/Makefile.am 2004-10-18 16:09:15.847008320 +0200 @@ -1 +1 @@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 diff -Naur gphoto2-2.1.4/m4/Makefile.in gphoto2/m4/Makefile.in --- gphoto2-2.1.4/m4/Makefile.in 2004-01-18 21:01:24.000000000 +0100 +++ gphoto2/m4/Makefile.in 2004-10-18 16:10:25.133044151 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ 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 @@ -35,7 +33,34 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = m4 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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 = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -75,6 +100,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -83,8 +109,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,6 +171,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -162,6 +193,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -169,22 +201,39 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 -subdir = m4 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 m4/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu m4/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -192,10 +241,6 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -209,7 +254,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -227,7 +272,6 @@ check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -240,7 +284,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -248,7 +292,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -265,6 +309,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -298,8 +344,8 @@ uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + 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-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ diff -Naur gphoto2-2.1.4/m4/po.m4 gphoto2/m4/po.m4 --- gphoto2-2.1.4/m4/po.m4 2003-10-08 17:30:49.000000000 +0200 +++ gphoto2/m4/po.m4 2004-10-18 16:09:15.806014807 +0200 @@ -1,4 +1,4 @@ -# po.m4 serial 1 (gettext-0.12) +# 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 @@ -111,7 +111,7 @@ 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, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # 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 @@ -127,19 +127,27 @@ # The set of available languages was given in configure.in. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) case "$ac_given_srcdir" in .) srcdirpre= ;; *) srcdirpre='$(srcdir)/' ;; esac POFILES= - GMOFILES= UPDATEPOFILES= DUMMYPOFILES= + GMOFILES= for lang in $ALL_LINGUAS; do POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. @@ -174,7 +182,7 @@ done fi test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do if test -f "$f"; then case "$f" in @@ -188,10 +196,231 @@ esac done], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # 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 -Naur gphoto2-2.1.4/m4/signed.m4 gphoto2/m4/signed.m4 --- gphoto2-2.1.4/m4/signed.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/signed.m4 2004-10-18 16:09:15.820012592 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/size_max.m4 gphoto2/m4/size_max.m4 --- gphoto2-2.1.4/m4/size_max.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/size_max.m4 2004-10-18 16:09:15.824011959 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/ulonglong.m4 gphoto2/m4/ulonglong.m4 --- gphoto2-2.1.4/m4/ulonglong.m4 2003-10-08 17:30:49.000000000 +0200 +++ gphoto2/m4/ulonglong.m4 2004-10-18 16:09:15.835010219 +0200 @@ -1,5 +1,5 @@ -# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. +# ulonglong.m4 serial 3 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -8,16 +8,18 @@ dnl From Paul Eggert. +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. + AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], + [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], [unsigned long long ullmax = (unsigned long long) -1; return ull << i | ull >> i | ullmax / ull | ullmax % ull;], ac_cv_type_unsigned_long_long=yes, ac_cv_type_unsigned_long_long=no)]) if test $ac_cv_type_unsigned_long_long = yes; then AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the unsigned long long type.]) + [Define if you have the 'unsigned long long' type.]) fi ]) diff -Naur gphoto2-2.1.4/m4/wchar_t.m4 gphoto2/m4/wchar_t.m4 --- gphoto2-2.1.4/m4/wchar_t.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/wchar_t.m4 2004-10-18 16:09:15.839009586 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/wint_t.m4 gphoto2/m4/wint_t.m4 --- gphoto2-2.1.4/m4/wint_t.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/wint_t.m4 2004-10-18 16:09:15.842009111 +0200 @@ -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 -Naur gphoto2-2.1.4/m4/xsize.m4 gphoto2/m4/xsize.m4 --- gphoto2-2.1.4/m4/xsize.m4 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/m4/xsize.m4 2004-10-18 16:09:15.845008637 +0200 @@ -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 -Naur gphoto2-2.1.4/Makefile.am gphoto2/Makefile.am --- gphoto2-2.1.4/Makefile.am 2004-01-18 21:01:11.000000000 +0100 +++ gphoto2/Makefile.am 2004-10-18 16:09:15.867005156 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = intl m4 doc gphoto2 packaging po +SUBDIRS = m4 doc gphoto2 packaging po ACLOCAL_AMFLAGS = -I m4 diff -Naur gphoto2-2.1.4/Makefile.in gphoto2/Makefile.in --- gphoto2-2.1.4/Makefile.in 2004-01-18 21:01:23.000000000 +0100 +++ gphoto2/Makefile.in 2004-10-18 16:10:25.549978173 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ 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 @@ -35,7 +33,60 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(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 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/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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 +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +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 AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -75,6 +126,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -83,8 +135,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,6 +197,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -162,6 +219,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -169,48 +227,45 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = intl m4 doc gphoto2 packaging po - +SUBDIRS = m4 doc gphoto2 packaging po ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = config.rpath mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = intl/Makefile -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ - ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \ - TODO aclocal.m4 config.guess config.h.in config.rpath \ - config.sub configure.in depcomp install-sh missing \ - mkinstalldirs -DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.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: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/nls.m4 m4/po.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -222,10 +277,10 @@ 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: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f config.h stamp-h1 @@ -292,14 +347,6 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -308,19 +355,22 @@ $(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 \ + 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 && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -330,10 +380,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + 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) @@ -356,24 +407,11 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/intl $(distdir)/packaging/rpm $(distdir)/po + $(mkdir_p) $(distdir)/intl $(distdir)/m4 $(distdir)/packaging/rpm $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -385,7 +423,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -400,15 +438,17 @@ || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -419,19 +459,46 @@ ! -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 + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | 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 + tardir=$(distdir) && $(am__tar) | 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 - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.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 @@ -452,19 +519,20 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + (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-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(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 \ @@ -488,7 +556,6 @@ all-am: Makefile config.h installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -500,7 +567,7 @@ installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -508,7 +575,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -526,6 +593,8 @@ dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -562,22 +631,20 @@ uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive dist \ - dist-all dist-gzip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am dvi-recursive info \ - info-am info-recursive install install-am install-data \ - install-data-am install-data-recursive install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive +.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-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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Naur gphoto2-2.1.4/missing gphoto2/missing --- gphoto2-2.1.4/missing 2003-10-08 17:21:39.000000000 +0200 +++ gphoto2/missing 2004-10-18 16:10:24.701112502 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +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 @@ -38,12 +42,23 @@ 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 @@ -74,11 +89,13 @@ 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]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" ;; -*) @@ -94,7 +111,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -108,7 +125,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -122,7 +139,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -146,7 +163,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -162,8 +179,8 @@ fi echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +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." @@ -185,7 +202,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -215,7 +232,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -243,7 +260,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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." @@ -268,7 +285,7 @@ fi echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +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, @@ -323,8 +340,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +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 @@ -334,3 +351,10 @@ 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 -Naur gphoto2-2.1.4/packaging/Makefile.in gphoto2/packaging/Makefile.in --- gphoto2-2.1.4/packaging/Makefile.in 2004-01-18 21:01:24.000000000 +0100 +++ gphoto2/packaging/Makefile.in 2004-10-18 16:10:25.263023582 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ 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 @@ -35,7 +33,43 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = packaging +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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) AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -75,6 +109,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -83,8 +118,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -142,6 +180,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -162,6 +202,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -170,28 +211,38 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = rpm -subdir = packaging -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 packaging/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu packaging/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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 @@ -253,14 +304,6 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -269,19 +312,22 @@ $(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 \ + 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 && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -291,10 +337,11 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + 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) @@ -317,10 +364,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -334,7 +377,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -349,15 +392,17 @@ || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -367,7 +412,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -379,7 +423,7 @@ installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -387,7 +431,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -404,6 +448,8 @@ dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -438,20 +484,17 @@ uninstall-info: uninstall-info-recursive -.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 dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ +.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 pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Naur gphoto2-2.1.4/packaging/rpm/gphoto2.spec gphoto2/packaging/rpm/gphoto2.spec --- gphoto2-2.1.4/packaging/rpm/gphoto2.spec 2004-01-18 21:01:44.000000000 +0100 +++ gphoto2/packaging/rpm/gphoto2.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -Summary: Command line interface to libgphoto2 -Name: gphoto2 -Version: 2.1.4 -Release: 1 -License: LGPL -Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: http://www.gphoto.org/dist/gphoto2-2.1.4.tar.gz -Url: http://www.gphoto.org/ -ExcludeArch: s390 s390x -Provides: gphoto2 -PreReq: libgphoto2-devel - -%description -gphoto2 is a command line client to for the libgphoto2. It allows to -use gPhoto software from a terminal or from a script shell to perform -any camera operation that can be done. This is the main user interface. - -%prep -rm -rf "${RPM_BUILD_DIR}/%{name}-%{version}" - -%setup -q -n %{name}-%{version} - -%build -%configure -make - -%install -rm -rf "${RPM_BUILD_ROOT}" -make DESTDIR=%{?buildroot:%{buildroot}} install - -%files -%defattr(-,root,root) -%{_bindir}/gphoto2 -%{_mandir}/man1/* -%{_datadir}/locale/* diff -Naur gphoto2-2.1.4/packaging/rpm/Makefile.am gphoto2/packaging/rpm/Makefile.am --- gphoto2-2.1.4/packaging/rpm/Makefile.am 2004-01-18 21:01:09.000000000 +0100 +++ gphoto2/packaging/rpm/Makefile.am 2004-03-24 02:50:07.000000000 +0100 @@ -1,8 +1,6 @@ -# $Id: Makefile.am,v 1.2 2003/08/24 20:17:16 hun Exp $ -# -# create an RPM package out of an automake based source distribution +# packaging/rpm/Makefile.am +# Create an RPM package out of an automake based source distribution. # 2001,2003 Hans Ulrich Niedermann -# EXTRA_DIST = package.spec.in @PACKAGE@.spec diff -Naur gphoto2-2.1.4/packaging/rpm/Makefile.in gphoto2/packaging/rpm/Makefile.in --- gphoto2-2.1.4/packaging/rpm/Makefile.in 2004-01-18 21:01:24.000000000 +0100 +++ gphoto2/packaging/rpm/Makefile.in 2004-10-18 16:10:25.383004596 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.9.1 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# 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. @@ -14,12 +14,9 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.2 2003/08/24 20:17:16 hun Exp $ -# -# create an RPM package out of an automake based source distribution +# packaging/rpm/Makefile.am +# Create an RPM package out of an automake based source distribution. # 2001,2003 Hans Ulrich Niedermann -# - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -27,7 +24,6 @@ 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 @@ -41,7 +37,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = packaging/rpm +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/package.spec.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.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/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.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/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.in +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 = package.spec +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AALIB_CONFIG = @AALIB_CONFIG@ AA_CFLAGS = @AA_CFLAGS@ AA_LIBS = @AA_LIBS@ @@ -81,6 +105,7 @@ GP_LIBS = @GP_LIBS@ HAVE_AA_FALSE = @HAVE_AA_FALSE@ HAVE_AA_TRUE = @HAVE_AA_TRUE@ +HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_CDK_FALSE = @HAVE_CDK_FALSE@ HAVE_CDK_TRUE = @HAVE_CDK_TRUE@ HAVE_EXIF_FALSE = @HAVE_EXIF_FALSE@ @@ -89,8 +114,11 @@ HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ HAVE_POPT_FALSE = @HAVE_POPT_FALSE@ HAVE_POPT_TRUE = @HAVE_POPT_TRUE@ +HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_RL_FALSE = @HAVE_RL_FALSE@ HAVE_RL_TRUE = @HAVE_RL_TRUE@ +HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_WPRINTF = @HAVE_WPRINTF@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -148,6 +176,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -168,6 +198,7 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -175,26 +206,41 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - EXTRA_DIST = package.spec.in @PACKAGE@.spec - DISTCLEANFILES = @PACKAGE@.spec -subdir = packaging/rpm -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = package.spec -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am package.spec.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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 packaging/rpm/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu packaging/rpm/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -package.spec: $(top_builddir)/config.status package.spec.in +.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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +package.spec: $(top_builddir)/config.status $(srcdir)/package.spec.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uninstall-info-am: tags: TAGS @@ -203,10 +249,6 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = ../.. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -220,7 +262,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -238,7 +280,6 @@ check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -251,13 +292,13 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -275,6 +316,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -308,8 +351,8 @@ uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + 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-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ diff -Naur gphoto2-2.1.4/po/az.po gphoto2/po/az.po --- gphoto2-2.1.4/po/az.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/az.po 2004-03-22 01:00:22.000000000 +0100 @@ -0,0 +1,1150 @@ +# Translation of 'gphoto' messages to Azerbaijani. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is put in the public domain. +# Mətin Əmirov , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: gphoto2-2.1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" +"PO-Revision-Date: 2004-03-20 20:58+0200\n" +"Last-Translator: Metin Amiroff \n" +"Language-Team: Azerbaijani \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "" + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "" + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "" + +#: gphoto2/actions.c:190 +#, c-format +msgid "File:\n" +msgstr "" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format +msgid " None available.\n" +msgstr "" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr "" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr "" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr "" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr "" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr "" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr "" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 +#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 +msgid "yes" +msgstr "bəli" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 +#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 +msgid "no" +msgstr "xeyir" + +#: gphoto2/actions.c:208 +#, c-format +msgid " Permissions: " +msgstr "" + +#: gphoto2/actions.c:211 +#, c-format +msgid "read/delete" +msgstr "" + +#: gphoto2/actions.c:213 +#, c-format +msgid "read" +msgstr "" + +#: gphoto2/actions.c:215 +#, c-format +msgid "delete" +msgstr "sil" + +#: gphoto2/actions.c:217 +#, c-format +msgid "none" +msgstr "heç biri" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr "" + +#: gphoto2/actions.c:224 +#, c-format +msgid "Thumbnail:\n" +msgstr "" + +#: gphoto2/actions.c:240 +#, c-format +msgid "Audio data:\n" +msgstr "" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr "" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr "" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr "" + +#: gphoto2/actions.c:392 +msgid "Could not parse EXIF data." +msgstr "" + +#: gphoto2/actions.c:396 +#, c-format +msgid "EXIF tags:" +msgstr "" + +#: gphoto2/actions.c:399 +msgid "Tag" +msgstr "Təq" + +#: gphoto2/actions.c:401 +msgid "Value" +msgstr "Qiymət" + +#: gphoto2/actions.c:422 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "" + +#: gphoto2/actions.c:431 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "" + +#: gphoto2/actions.c:449 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "" + +#: gphoto2/actions.c:451 +#, c-format +msgid "Supported cameras:\n" +msgstr "" + +#: gphoto2/actions.c:464 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "" + +#: gphoto2/actions.c:467 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "" + +#: gphoto2/actions.c:472 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t\"%s\"\n" + +#: gphoto2/actions.c:500 +#, c-format +msgid "Devices found: %i\n" +msgstr "" + +#: gphoto2/actions.c:501 +#, c-format +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" + +#: gphoto2/actions.c:540 gphoto2/actions.c:545 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:540 +msgid "Model" +msgstr "Model" + +#: gphoto2/actions.c:540 +msgid "Port" +msgstr "Port" + +#: gphoto2/actions.c:541 +#, c-format +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:559 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "" + +#: gphoto2/actions.c:560 +#, c-format +msgid "Serial port support : %s\n" +msgstr "" + +#: gphoto2/actions.c:562 +#, c-format +msgid "USB support : %s\n" +msgstr "" + +#: gphoto2/actions.c:565 +#, c-format +msgid "Transfer speeds supported :\n" +msgstr "" + +#: gphoto2/actions.c:567 +#, c-format +msgid " : %i\n" +msgstr "" + +#: gphoto2/actions.c:570 +#, c-format +msgid "Capture choices :\n" +msgstr "" + +#: gphoto2/actions.c:572 +#, c-format +msgid " : Image\n" +msgstr "" + +#: gphoto2/actions.c:576 +#, c-format +msgid " : Video\n" +msgstr "" + +#: gphoto2/actions.c:580 +#, c-format +msgid " : Audio\n" +msgstr "" + +#: gphoto2/actions.c:584 +#, c-format +msgid " : Preview\n" +msgstr "" + +#: gphoto2/actions.c:588 +#, c-format +msgid "" +" : Capture not supported by the driver\n" +msgstr "" + +#: gphoto2/actions.c:590 +#, c-format +msgid "Configuration support : %s\n" +msgstr "" + +#: gphoto2/actions.c:592 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "" + +#: gphoto2/actions.c:595 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "" + +#: gphoto2/actions.c:598 +#, c-format +msgid "File upload support : %s\n" +msgstr "" + +#: gphoto2/actions.c:615 +#, c-format +msgid "" +"Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a " +"colon so I am going to guess what you mean." +msgstr "" + +#: gphoto2/actions.c:654 +#, c-format +msgid "" +"The port you specified ('%s') can not be found. Please specify one of the " +"ports found by 'gphoto2 --list-ports' and make sure the spelling is correct " +"(i.e. with prefix 'serial:' or 'usb:')." +msgstr "" + +#: gphoto2/actions.c:692 +#, c-format +msgid "About the camera driver:" +msgstr "" + +#: gphoto2/actions.c:706 +#, c-format +msgid "Camera summary:" +msgstr "" + +#: gphoto2/actions.c:720 +#, c-format +msgid "Camera manual:" +msgstr "" + +#: gphoto2/actions.c:736 +#, c-format +msgid "You can only specify speeds for serial ports." +msgstr "" + +#: gphoto2/actions.c:787 +#, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named " +"COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and " +"options:\n" +msgstr "" + +#: gphoto2/actions.c:800 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "" + +#: gphoto2/actions.c:915 +msgid "" +"ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE " +"MAILING LIST:" +msgstr "" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "" +"Bad file number. You specified %i, but there are only %i files available in " +"'%s' or its subfolders. Please obtain a valid file number from a file " +"listing first." +msgstr "" + +#: gphoto2/foreach.c:283 +#, c-format +msgid "" +"Bad file number. You specified %i, but there is only 1 file available in '%" +"s'." +msgstr "" + +#: gphoto2/foreach.c:291 +#, c-format +msgid "" +"Bad file number. You specified %i, but there are only %i files available in " +"'%s'.Please obtain a valid file number from a file listing first." +msgstr "" + +#: gphoto2/gp-params.c:53 +#, c-format +msgid "*** Error *** \n" +msgstr "*** Xəta *** \n" + +#: gphoto2/gp-params.c:220 +#, c-format +msgid "Press any key to continue.\n" +msgstr "Davam etmək üçün bir düyməyə basın.\n" + +#: gphoto2/gp-params.c:237 +#, c-format +msgid "Not enough memory." +msgstr "Yaddaş çatışmır." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Əməliyyat ləğv edildi" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Davam Et" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Ləğv Et" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Xəta" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Quraşdırma seçilə bilmədi:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Çıx" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Geri" + +#: gphoto2/gphoto2-cmd-config.c:254 +msgid "Time: " +msgstr "Saat: " + +#: gphoto2/gphoto2-cmd-config.c:313 gphoto2/gphoto2-cmd-config.c:341 +#: gphoto2/gphoto2-cmd-config.c:401 gphoto2/gphoto2-cmd-config.c:464 +msgid "Value: " +msgstr "Qiymət: " + +#: gphoto2/gphoto2-cmd-config.c:363 +msgid "Yes" +msgstr "Bəli" + +#: gphoto2/gphoto2-cmd-config.c:363 +msgid "No" +msgstr "Xeyir" + +#: gphoto2/main.c:161 gphoto2/main.c:1486 +msgid "Turn on debugging" +msgstr "Xəta ayırmasını fəallaşdır" + +#: gphoto2/main.c:162 gphoto2/main.c:1488 +msgid "Quiet output (default=verbose)" +msgstr "Gizli yekun (ön qurğulusu=verbose)" + +#: gphoto2/main.c:166 gphoto2/main.c:1492 +msgid "Display version and exit" +msgstr "Buraxılışı göstər və çıx" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Bu yardım ekranını göstər" + +#: gphoto2/main.c:168 gphoto2/main.c:1494 +msgid "List supported camera models" +msgstr "DƏstəklənən kamera modellərini göstər" + +#: gphoto2/main.c:169 gphoto2/main.c:1496 +msgid "List supported port devices" +msgstr "Dəstəklənən port avadanlıqlarını göstər" + +#: gphoto2/main.c:170 gphoto2/main.c:1498 +msgid "Send file to stdout" +msgstr "Faylı stdout-a göndər" + +#: gphoto2/main.c:171 gphoto2/main.c:1500 +msgid "Print filesize before data" +msgstr "Datadan əvvəl fayl böyüklüyünü göstər" + +#: gphoto2/main.c:172 gphoto2/main.c:1502 +msgid "List auto-detected cameras" +msgstr "Avtomatik tapılan kameraları göstər" + +#: gphoto2/main.c:175 gphoto2/main.c:1504 +msgid "Specify port device" +msgstr "Port avadanlığını bildir" + +#: gphoto2/main.c:176 gphoto2/main.c:1506 +msgid "Specify serial transfer speed" +msgstr "Serial transfer sür'ətini bildir" + +#: gphoto2/main.c:177 gphoto2/main.c:1508 +msgid "Specify camera model" +msgstr "Kamera modelini bildir" + +#: gphoto2/main.c:178 gphoto2/main.c:1510 +msgid "Specify a filename" +msgstr "Fayl adı bildir" + +#: gphoto2/main.c:179 gphoto2/main.c:1512 +msgid "(expert only) Override USB IDs" +msgstr "" + +#: gphoto2/main.c:182 gphoto2/main.c:1514 +msgid "Display camera abilities" +msgstr "Kamera bacarıqlarını göstər" + +#: gphoto2/main.c:183 gphoto2/main.c:1516 +msgid "Specify camera folder (default=\"/\")" +msgstr "" + +#: gphoto2/main.c:184 gphoto2/main.c:1518 +msgid "Recursion (default for download)" +msgstr "" + +#: gphoto2/main.c:185 gphoto2/main.c:1520 +msgid "No recursion (default for deletion)" +msgstr "" + +#: gphoto2/main.c:186 gphoto2/main.c:1522 +msgid "List folders in folder" +msgstr "Qovluqdakı qovluqları göstər" + +#: gphoto2/main.c:187 gphoto2/main.c:1524 +msgid "List files in folder" +msgstr "Qovluqdakı faylları göstər" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "ad" + +#: gphoto2/main.c:188 gphoto2/main.c:1526 +msgid "Create a directory" +msgstr "Cərgə yarat" + +#: gphoto2/main.c:189 gphoto2/main.c:1528 +msgid "Remove a directory" +msgstr "Cərgəni sil" + +#: gphoto2/main.c:190 gphoto2/main.c:1530 +msgid "Display number of files" +msgstr "Fayl ədədini göstər" + +#: gphoto2/main.c:191 gphoto2/main.c:1532 +msgid "Get files given in range" +msgstr "Verilən aralıqdakı faylları al" + +#: gphoto2/main.c:192 gphoto2/main.c:1534 +msgid "Get all files from folder" +msgstr "Qovluqdakı bütün faylları al" + +#: gphoto2/main.c:193 gphoto2/main.c:1536 +msgid "Get thumbnails given in range" +msgstr "Verilən aralıqdakı dırnaq görünüşlərini al" + +#: gphoto2/main.c:194 gphoto2/main.c:1539 +msgid "Get all thumbnails from folder" +msgstr "Qovluqdakı dırnaq görünüşlərini al" + +#: gphoto2/main.c:195 gphoto2/main.c:1542 +msgid "Get raw data given in range" +msgstr "Verilən aralıqdakı xam faylları al" + +#: gphoto2/main.c:196 gphoto2/main.c:1545 +msgid "Get all raw data from folder" +msgstr "Qovluqdakı bütün xam faylları al" + +#: gphoto2/main.c:197 gphoto2/main.c:1548 +msgid "Get audio data given in range" +msgstr "Verilən aralıqdakı səs fayllarını al" + +#: gphoto2/main.c:198 gphoto2/main.c:1551 +msgid "Get all audio data from folder" +msgstr "Qovluqdakı bütün səs fayllarını al" + +#: gphoto2/main.c:199 gphoto2/main.c:1553 +msgid "Delete files given in range" +msgstr "Verilən aralıqdakı faylları sil" + +#: gphoto2/main.c:200 gphoto2/main.c:1555 +msgid "Delete all files in folder" +msgstr "Qovluqdakı bütün faylları sil" + +#: gphoto2/main.c:201 gphoto2/main.c:1557 +msgid "Upload a file to camera" +msgstr "Faylı kameraya yolla" + +#: gphoto2/main.c:203 gphoto2/main.c:1560 +msgid "Configure" +msgstr "Quraşdır" + +#: gphoto2/main.c:205 gphoto2/main.c:1564 +msgid "Capture a quick preview" +msgstr "Sür'ətli nümayiş yaxala" + +#: gphoto2/main.c:206 gphoto2/main.c:1566 +msgid "Capture an image" +msgstr "Rəsm yaxala" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Film yaxala " + +#: gphoto2/main.c:208 gphoto2/main.c:1570 +msgid "Capture an audio clip" +msgstr "Səs klipi yaxala" + +#: gphoto2/main.c:210 gphoto2/main.c:1573 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "EXIF mə'lumatını göstər" + +#: gphoto2/main.c:212 gphoto2/main.c:1576 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Mə'lumatı göstər" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "Kamera vəziyyətinin icmalı" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "Kamera sürücüsü əl kitabı" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "Kamera sürücüsü haqqında" + +#: gphoto2/main.c:216 gphoto2/main.c:1584 +msgid "gPhoto shell" +msgstr "gPhoto qabığı" + +#: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format +msgid "" +"Use the following syntax a:b=c:d to treat any USB device detected as a:b as " +"c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "Yan" + +#: gphoto2/main.c:466 +msgid "January" +msgstr "Yanvar" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "Fev" + +#: gphoto2/main.c:467 +msgid "February" +msgstr "Fevral" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "Mar" + +#: gphoto2/main.c:468 +msgid "March" +msgstr "Mart" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "Apr" + +#: gphoto2/main.c:469 +msgid "April" +msgstr "Aprel" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "May" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "İyn" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "İyun" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "İyl" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "İyul" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "Avq" + +#: gphoto2/main.c:473 +msgid "August" +msgstr "Avqust" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "Sen" + +#: gphoto2/main.c:474 +msgid "September" +msgstr "Sentyabr" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "Okt" + +#: gphoto2/main.c:475 +msgid "October" +msgstr "Oktyabr" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "Noy" + +#: gphoto2/main.c:476 +msgid "November" +msgstr "Noyabr" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "Dek" + +#: gphoto2/main.c:477 +msgid "December" +msgstr "Dekabr" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "Baz" + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "Bazar" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "Bze" + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "Bazar ertəsi" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "Çax" + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "Çərşənbə axşamı" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "Çrş" + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "Çərşənbə" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "Cax" + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "Cümə axşamı" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "Cüm" + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "Cümə" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "Şnb" + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "Şənbə" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "" + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "%s faylı mövcuddur. Üstündən yazılsın? [b|x] " + +#: gphoto2/main.c:712 +#, c-format +msgid "Specify new filename? [y|n] " +msgstr "Yeni fayl adı seçilsin? [b|x] " + +#: gphoto2/main.c:721 +#, c-format +msgid "Enter new filename: " +msgstr "Yeni fayl adı bildirin: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Fayl %s adı ilə qeyd edilir\n" + +#: gphoto2/main.c:943 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "Yeni fayl kamerada %s%s%s mövqeyindədir\n" + +#: gphoto2/main.c:1075 +#, c-format +msgid "ERROR: " +msgstr "XƏTA: " + +#: gphoto2/main.c:1098 +#, c-format +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Ləğv edilir...\n" + +#: gphoto2/main.c:1104 +#, c-format +msgid "Aborted.\n" +msgstr "Ləğv edildi.\n" + +#: gphoto2/main.c:1109 +#, c-format +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Ləğv edilir...\n" + +#: gphoto2/main.c:1316 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "gphoto2 CDK dəstəyi olmadan dərlənibdir." + +#: gphoto2/main.c:1429 +#, c-format +msgid "Operation cancelled.\n" +msgstr "Əməliyyat ləğv edildi.\n" + +#: gphoto2/main.c:1433 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Xəta (%i: '%s') *** \n" +"\n" + +#: gphoto2/main.c:1437 +#, c-format +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" + +#: gphoto2/main.c:1490 +msgid "Overwrite files without asking." +msgstr "Məzmunu soruşmadan əvəz et" + +#: gphoto2/main.c:1504 +msgid "path" +msgstr "cığır" + +#: gphoto2/main.c:1506 +msgid "speed" +msgstr "sür'ət" + +#: gphoto2/main.c:1508 +msgid "model" +msgstr "model" + +#: gphoto2/main.c:1510 +msgid "filename" +msgstr "fayl adı" + +#: gphoto2/main.c:1512 +msgid "usbid" +msgstr "usbid" + +#: gphoto2/main.c:1516 +msgid "folder" +msgstr "qovluq" + +#: gphoto2/main.c:1568 +msgid "Capture a movie" +msgstr "Film yaxala" + +#: gphoto2/main.c:1578 +msgid "Show summary" +msgstr "İcmalı göstər" + +#: gphoto2/main.c:1580 +msgid "Show camera driver manual" +msgstr "Kamera sürücüsü əl kitabını göstər" + +#: gphoto2/main.c:1582 +msgid "About the camera driver manual" +msgstr "Kamera sürücüsü əl kitabı haqqında" + +#: gphoto2/main.c:1809 +#, c-format +msgid "" +"gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " +"location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "" + +#: gphoto2/main.c:1819 +#, c-format +msgid "" +"gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " +"location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "" + +#: gphoto2/options.c:181 +#, c-format +msgid "Usage:\n" +msgstr "İstifadə qaydası:\n" + +#: gphoto2/options.c:184 +#, c-format +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +#, c-format +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one " +"(1)]\n" +msgstr "" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Xəta (%i: '%s') ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Kameradakı cərgəyə keç" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "cərgə" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Yerli sürücüdəki cərgəyə keç" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "gPhoto qabığından çıx" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Faylı endir" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[cərgə/]fayladı" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Dırnaq görünüşünü endir" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Xam mə'lumatı endir" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Sil" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Əmrin istifadə qaydasını göstər" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[əmr]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "Hazırkı cərgənin məzmununu göstər" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[cərgə/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "Hökmsüz əmr." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "'%s' əmrinə arqument verilməlidir." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "Hökmsüz cığır." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "" + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "" + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "" + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "" + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "" + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "\"%s\" yardımı:" + +#: gphoto2/shell.c:743 +#, c-format +msgid "Usage:" +msgstr "İstifadə qaydası:" + +#: gphoto2/shell.c:747 +#, c-format +msgid "Description:" +msgstr "İzahat:" + +#: gphoto2/shell.c:749 +#, c-format +msgid "* Arguments in brackets [] are optional" +msgstr "" + +#: gphoto2/shell.c:770 +#, c-format +msgid "Available commands:" +msgstr "" + +#: gphoto2/shell.c:775 +#, c-format +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "" diff -Naur gphoto2-2.1.4/po/ChangeLog gphoto2/po/ChangeLog --- gphoto2-2.1.4/po/ChangeLog 2004-01-18 21:01:11.000000000 +0100 +++ gphoto2/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -2004-01-18 gettextize - - * Makefile.in.in: New file, from gettext-0.12.1. - * Rules-quot: New file, from gettext-0.12.1. - * boldquot.sed: New file, from gettext-0.12.1. - * en@boldquot.header: New file, from gettext-0.12.1. - * en@quot.header: New file, from gettext-0.12.1. - * insert-header.sin: New file, from gettext-0.12.1. - * quot.sed: New file, from gettext-0.12.1. - * remove-potcdate.sin: New file, from gettext-0.12.1. - diff -Naur gphoto2-2.1.4/po/cs.gmo gphoto2/po/cs.gmo --- gphoto2-2.1.4/po/cs.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/cs.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,178 +0,0 @@ -= -&=)d)+)!3Odx  "J,w0#& *'Iq!;  S&& MWo N`u##(<Ge& )'B_rv& 5Ne* - $(!1&S&z    !!=![!t!! !(!!+! ""0"4"<"@"E"I"N"i"~"""*""###!#'#+#-2#`##c###### ## $$$+$A$la$$u$I%e%% %%%%%%&"& &&&0&W&&& ' '#'#6'Z'o''''''''&'E!(g("%)$H)"m)$)!)#)) ) **A*#]****&*****+++ ++-+=+ , ,%,:, A,K,T, [,h,,o|-/.2/O/U/Z/]/b/g/ l/x/~//U/000 1"1&31)Z1,1+1)122.2K2`2t2222223 "3 /3E93#363,3$4,4!I47k44!44;4755 5 6X6'n666!66666777.7477U88 99 69D9S9l99%9&9)9X :&e::.:#::;!;5;9; B;'L;!t;);;; ;<<6<"T<w<<<<*< <<==1=6=$<=)a=*==!=>>+>%?%>?&d?%??(?!?@+1@]@,q@@@@@ @@@+@AA'gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 2.1.2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-10-21 13:48+0200 -Last-Translator: Miloslav Trmac -Language-Team: Czech -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - "%s" - "%s" (EXPERIMENTÁLNÍ) - "%s" (TESTOVÁNÍ) - -Končím... - -Přerušuji... - : %i - : Video - : Obrázek - : Náhled - : Video - Staženo: %s - Staženo: %s - Výška: %i pixelů - Typ mime: '%s' - Typ mime: '%s' - Název: '%s' - Žádný není k dispozici. - Oprávnění: Velikost: %li bajtů - Velikost: %li bajtů - Čas: %s Šířka: %i pixelů -%-30s %-16s -%-38s %s -%s -Sestupné rozsahy nejsou povoleny. Zadali jste rozsah od %i do %i.%s -ID obrázku %i příliš velké.%s -ID obrázků musí být číslo větší než nula.%s -Rozsahy musí být odděleny pomocí ','.%s -Rozsahy musí začínat číslem.%s -Neočekávaný znak '%c'.(jen pro experty) Přebít USB ID* Argumenty v hranatých závorkách [] jsou nepovinné*** Chyba (%i: '%s') ****** Chyba (%i: '%s') *** - -*** Chyba *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Používejte uvozovky kolem argumentů] [Čísla obrázků začínají jedničkou (1)] -PokračovatZrušitChybaPŘI POSÍLÁNÍ LADICÍCH ZPRÁV DO KONFERENCE VŽDY PŘILOŽTE NÁSLEDUJÍCÍ ŘÁDKY:Schopnosti fotoaparátu : %s -Skončil jsem. -O ovladači kameryO manuálu ovladače fotoaparátuO ovladači fotoaparátu:DubDubenZvuková data: -SrpSrpenDostupné příkazy:ZpětŠpatné číslo souboru. Zadali jste %1$i, ale v '%3$s' a jeho podadresářích je k dispozici jen '%2$i' souborů. Nejdříve prosím získejte ze seznamu souborů platné číslo souboru.Špatné číslo souboru. Zadali jste %1$i, ale v '%3$s' je k dispozici jen '%2$i' souborů. Nejdříve prosím získejte ze seznamu souborů platné číslo souboru.Špatné číslo souboru. Zadali jste %i, ale v '%s' je k dispozici jen jeden soubor.Manuál ovladače kameryManuál fotoaparátu:Shrnutí fotoaparátu:Zachytit filmZachytit film Zachytit rychlý náhledZachytit zvukový klipZachytit obrázekMožnosti zachycení : -Přejít do adresáře ve fotoaparátuPřejít do adresáře na místním diskuPříkaz '%s' nenalezen. Použijte 'help' pro získání seznamu dostupných příkazů.Podpora konfigurace : %s -NastavitNemohu přejít do místního adresáře '%s'.Nemohu nalézt domovský adresář.Nemohu zpracovat data EXIF.Nemohu nastavit konfiguraci:Vytvořit adresářProProsinecOdstranitOdstranit všechny soubory v adresářiOdstranit soubory dané v rozsahuPodpora odstranění souborů t : %s -Popis:Nalezená zařízení: %i -Zobrazit schopnosti fotoaparátuZobrazit počet souborůZobrazit verzi a skončitZobrazí použití příkazůZobrazí tuto obrazovku nápovědyStáhnout souborStáhnout náhledStáhnout neupravená dataCHYBA: Data EXIF obsahují miniaturu (%i bajtů).Značky EXIF:Zadejte nový název souboru: KonecUkončit shell gPhotoÚnoÚnorSoubor %s existuje. Přepsat? [y|n] Podpora náhledů souborů : %s -Podpora ukládání souborů : %s -Soubor: -Pro ladicí zprávy prosím použijte přepínač --debug. -Ladicí zprávy mohou pomoci nalézt řešení vašeho problému. -Pokud hodláte poslat chybové nebo ladicí zprávy do -konference vývojářů gphoto , -spusťte prosím gphoto2 následovně: - -PáPátekZískat všechna zvuková data z adresářeZískat všechny soubory z adresářeZískat neupravená data z adresářeZískat všechny náhledy z adresářeZískat zvuková data daná v rozsahuZískat soubory dané v rozsahuZískat neupravená data daná v rozsahuZískat miniatury dané v rozsahuNápověda pro "%s":Informace o souboru '%s' (adresář '%s'): -Neplatný příkaz.Neplatný formát '%s' (chyba na pozici %i).Neplatná cesta.LedLedenČecČervenecČenČervenVypsat automaticky detekované fotoaparátyVypsat soubory v adresářiVypsat adresáře v adresářiVypsat podporované modly fotoaparátůVypsat podporovaná zařízení portuVypsat obsah aktuálního adresářeMístní adresář je nyní '%s'.BřeBřezenKvěModelPoPondělíNový soubor je na fotoaparátu v umístění %s%s%s -NeŽádná rekurze (implicitní pro odstraňování)Nedostatek paměti.LisListopadPočet souborů v adresáři '%s': %i -Počet podporovaných fotoaparátů: %i -OS/2 port napsal Bart van Leeuwen -ŘíjŘíjenOperace přerušenaOperace přerušena. -Přepisovat soubory bez ptaní.Cesta Popis --------------------------------------------------------------- -PortPorty musí vypadat jako 'serial:/dev/ttyS0' nebo 'usb;', ale v '%s' chybí dvojtečka, takže budu hádat, co tím myslíte.Pokračujte stisknutím libovolné klávesy. -Vytisknout před daty velikost souboruTichý výstup (implicitní=podrobný)Rekurze (implicitní pro stahování)Vzdálený adresář je nyní '%s'.Odstranit adresářSoSobotaUkládám souboru jako %s -Poslat soubor na stdoutZářZáříPodpora sériového portu : %s -Krátké/dlouhé přepínače (& argument) Popis --------------------------------------------------------------------------------- -Zobrazit informace EXIFZobrazit manuál ovladače fotoaparátuZobrazit informaceZobrazit souhrnUrčení názvu souboruUrčení adresáře fotoaparátu (implicitní="/")Určení modelu fotoaparátuZadat nový název souboru? [y|n] Určení zařízení portuUrčení rychlosti sériového přenosuSouhrn stavu kameryNeNedělePodporované fotoaparáty: -ZnačkaPříkaz '%s' vyžaduje argument.Název souboru dotaný fotoaparátem ('%s') neobsahuje příponu!Port, který jste určili, ('%s'), nelze najít. Zadejte prosím jeden z portů nalezených 'gphoto2 --list-ports' a ujistěte se, že zápis je správný (např. s předponou 'serial:' nebo 'usb:').V adresáři '%2$s' je %1$i souborů:V adresáři '%2$s' je %1$i adresářů:V adresáři '%s' nejsou žádné soubory.V adresáři '%s' nejsou žádné adresáře.V adresáři '%s' je jeden soubor:V adresáři '%s' je jeden adresář:ČtMiniatura: -ČtvrtekČas: Pro získání nápovědy o konkrétním příkazu napište 'help název-příkazu'.Podporované rychlosti přenosu : -ÚtÚterýZapnout laděníPodpora USB : %s -Uložit soubor do fotoaparátuPoužití:Použití: -Použijte následující syntax a:b=c:d pro obsluhu libovolného zařízení detekovaného jako a:b místo toho jako c:d. a b c d by měly být šestnáctková čísla začínající '0x'. -HodnotaHodnota: StStředaAnoMůžete určovat rychlosti jen pro sériové porty.Nemůžete použít '%n' v kombinaci s neperzistentními soubory![příkaz][adresář/][adresář/]názevsouboruodstraněníadresářnázevsouboruadresářshell gPhotogPhoto2 pro OS/2 vyžaduje, abyste nastavili hodnotu prostředí CAMLIBS na umístění knihoven fotoaparátu. např.. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 pro OS/2 vyžaduje, abyste nastavili hodnotu prostředí IOLIBS na umístění knihoven io. např.. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (C) 2000-2003 Lutz Mueller a další -%s -gphoto2 je dodáváno BEZ ZÁRUKY, v rozsahu povoleném zákonem. Můžete -šířit kopie gphoto2 za podmínek GNU General Public License. Pro více -informací o těchto věcech viz soubor COPYING. - -Tato verze gphoto2 používá následující verze a nastavení softwaru: -gphoto2 bylo přeloženo bez podpory EXIF.gphoto2 bylo přeloženo bez podpory pro CDK.modelnázevnežádnécestačteníčtení/odstraněnírychlostusbidano \ No newline at end of file diff -Naur gphoto2-2.1.4/po/cs.po gphoto2/po/cs.po --- gphoto2-2.1.4/po/cs.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/cs.po 2004-03-22 01:01:44.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gphoto2 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-10-21 13:48+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -56,10 +56,12 @@ msgstr "Informace o souboru '%s' (adresář '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Soubor:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " Žádný není k dispozici.\n" @@ -106,22 +108,27 @@ msgstr "ne" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Oprávnění: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "čtení/odstranění" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "čtení" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "odstranění" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "žádné" @@ -131,10 +138,12 @@ msgstr " Čas: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Miniatura:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Zvuková data:\n" @@ -158,6 +167,7 @@ msgstr "Nemohu zpracovat data EXIF." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "Značky EXIF:" @@ -184,6 +194,7 @@ msgstr "Počet podporovaných fotoaparátů: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Podporované fotoaparáty:\n" @@ -208,6 +219,7 @@ msgstr "Nalezená zařízení: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -229,6 +241,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -248,6 +261,7 @@ msgstr "Podpora USB : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Podporované rychlosti přenosu :\n" @@ -257,27 +271,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Možnosti zachycení :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Obrázek\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Video\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Náhled\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Náhled\n" @@ -323,18 +342,22 @@ "s předponou 'serial:' nebo 'usb:')." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "O ovladači fotoaparátu:" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Shrnutí fotoaparátu:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Manuál fotoaparátu:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Můžete určovat rychlosti jen pro sériové porty." @@ -343,7 +366,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -355,7 +378,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (C) 2000-2003 Lutz Mueller a další\n" +"Copyright (C) 2000-2004 Lutz Mueller a další\n" "%s\n" "gphoto2 je dodáváno BEZ ZÁRUKY, v rozsahu povoleném zákonem. Můžete\n" "šířit kopie gphoto2 za podmínek GNU General Public License. Pro více\n" @@ -405,14 +428,17 @@ "souboru." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Chyba *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Pokračujte stisknutím libovolné klávesy.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Nedostatek paměti." @@ -646,6 +672,7 @@ msgstr "shell gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -825,10 +852,12 @@ msgstr "Soubor %s existuje. Přepsat? [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Zadat nový název souboru? [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Zadejte nový název souboru: " @@ -843,10 +872,12 @@ msgstr "Nový soubor je na fotoaparátu v umístění %s%s%s\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "CHYBA: " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -855,10 +886,12 @@ "Končím...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Skončil jsem.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -871,6 +904,7 @@ msgstr "gphoto2 bylo přeloženo bez podpory pro CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operace přerušena.\n" @@ -884,6 +918,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -944,6 +979,7 @@ msgstr "O manuálu ovladače fotoaparátu" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -952,6 +988,7 @@ "umístění knihoven fotoaparátu. např.. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -960,10 +997,12 @@ "umístění knihoven io. např.. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Použití:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -977,6 +1016,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1143,22 +1183,27 @@ msgstr "Nápověda pro \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Použití:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Popis:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Argumenty v hranatých závorkách [] jsou nepovinné" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Dostupné příkazy:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Pro získání nápovědy o konkrétním příkazu napište 'help název-příkazu'." diff -Naur gphoto2-2.1.4/po/.cvsignore gphoto2/po/.cvsignore --- gphoto2-2.1.4/po/.cvsignore 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/.cvsignore 2004-03-24 02:19:29.000000000 +0100 @@ -0,0 +1,11 @@ +ChangeLog +*~ .*~ +.arch-ids +*.gmo +gphoto2.pot +Makefile +Makefile.in +Makefile.in.in +POTFILES +Makevars +remove-potcdate.sed diff -Naur gphoto2-2.1.4/po/da.gmo gphoto2/po/da.gmo --- gphoto2-2.1.4/po/da.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/da.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,160 +0,0 @@ -= &-)T)~+)#?Th}  Jg0#&'9a!z;  S& =G_~ sNPet##(,GU& )2Obfov&  %>Uo* -!!&C&j     !-!K!d!! !(!!+! " "$","0"5"9">"Y"n"""*""## ####-"#P##S#w##### ####$$1$lQ$$u$9%U%p% %%%%%%%& && &G&&& & ''#&'J'_'|'''''''&'E(W(")$8)"])$)!)#)) ))*A *#M*q*u*}*&*****r+x++ ++-+=+ + ,,*, 1,;,D, K,X,,/l-2------- ---.?.H/O/f/ v//&/'/+/+0);0e0y0000000 1*1G1Y1 t1 1P1101"&2#I2m2(2%22"23;-3i3 44 *4T64&4 444455 555#5<5D55S66 677 $707G7X7$g77&7W7/+8 -[8&f8!888889 99'93G9 {9999999 ::::J:,P: }::::::-:+:&#;J;2P;<<<<<<!="= >=)_==(==*==>>>>#>'>,>J>^>#s> >'>>>>? ???'?B?$F?#k????!?#?@@ @"@;@m[@@s@"BAeA"A%AAAAABB%B )B03BdBBBC "C/C%ECkC!CCCCCCDD#!D@EDD"]E#E%E&E E"F5F 9FFFNFESF+FFFF0FG*G0G7GGGGGG6G?)H -iH -tHHHHHH HHJ GJQJWJy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 2.1.1 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-03-08 20:07+0100 -Last-Translator: Keld Simonsen -Language-Team: Danish -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8-bit - "%s" - "%s" (EKSPERIMENTEL) - "%s" (TESTER) - -Afbryder... - -Annullerer... - : %i - : Lyd - : Billede - : Smugkig - : Video - hjemhentet: %s - Nedhentet: %s - Hjde: %i punkter - Mime-type: '%s' - Mime-type: '%s' - Navn: '%s' - Ingen tilgngelig. - Rettigheder: Strrelse: %li byte(s) - Strrelse: %li byte(s) - Tid: %s Bredde: %i punkter -%-30s %-16s -%-38s %s -%s -Nedadgende intervaller er ikke tilladte. Du angav et interval fra %i til %i.%s -Billed-ID %i for hj.%s -Billed-ID'er skal vre et tal strre end nul.%s -Interval skal separeres af ','.%s -Interval skal starte med et tal.%s -Uventet tegn '%c'.(kun for eksperter) tilsidest USB ID'er* Argumenter i klammer [] er valgfri.*** Fejl (%i: '%s') ****** Fejl (%i: '%s') *** - -*** Fejl *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Brug gsejne omkring argumenter] [Foto-numre begynder med t (1) ] -FortstAnnullrFejlINKLUDR ALTID DE FLGENDE LINJER NR DU SENDER FEJLSGNINGSBESKEDER TIL POSTLISTEN:Kameraets faciliteter : %s -Afbrudt. -Om kameradrivrutinenOm kameradrivrutinens manualOm kameradrivrutinen:apraprilLyddata: -augaugustTilgngelige kommandoer:TilbageFejlagtigt filnummer. Du specificerede %i, men der fandtes kun %i filer tilgngelige i '%s' eller dets underkataloger. Skav venligst et gyldigt filnummer fra en filliste frst.Fejlagtigt filnummer. Du specificerede %i, men der er kun %i filer tilgngelige i '%s'. Skaf venligst et gyldigt filnummer fra en filliste frst.Fejlagtigt filnummer. Du specificerede %i, men der er kun 1 fil tilgngelig i '%s'.Kameradrivrutinens manualKameramanual:Kamera oversigt:Indspil en filmTag en filmTag et hurtigt smugkigTag et lydafsnitTag et billedeFangst-valg : -ndr til et katalog i kameraet.ndr til et katalog p den lokale diskKommandoen '%s' ikke fundet. Brug 'help' for at f en liste af tilgngelige kommandoer.Konfigurationsunderstttelse :%s -KonfigurrKunne ikke g til lokalt katalog '%s'.Kunne ikke finde hjemmekataloget.Kunne ikke tolke EXIF-data.Kunne ikke stte konfiguration:Opret et katalogdecdecemberSletSlet alle filer i mappenSlet filer i det givne intervalUnderstttelse for sletning af filer p kamera: %s -Beskrivelse:Enheder fundet: %i -Vis kamera-faciliteterVis antal filerViser version og afslutterViser kommandobrugViser denne hjlpetekstHjemhent es billedeHjemhentning af en miniatureHjemhent rdataFEJL:EXIF-data indeholder en miniature (%i byte).EXIF-mrker:Indtast nyt filnavn: AfslutAfslut gPhoto-skallenfebfebruarFilen %s eksisterer. Overskriv? Ja/Nej [y|n] Fil smugkig (miniature) understttelse: %s -Filoplgnings-understttelse : %s -Fil: -For fejlsgningsmeddelelser brug venligst flaget --debug. -Fejlsgningsmeddelelser kan hjlpe med at finde en lsning til dit problem. -Hvis du ptnker at sende en fejl- eller fejlsgningsmeddelelse til gphoto- -udviklernes postliste , s kr venligst -gphoto2 som flger: -frefredagHent alle lyddata fra mappenHent alle filer fra mappenHent alle rdata fra mappenHent alle miniaturer i mappenHent lyddata i det givne intervalHent filer givet i intervalHent rdata i det givne intervalHent alle miniaturer i det givne intervalHjlp om "%s":Information om filen '%s' (mappe '%s'): -Ugyldig kommando.Ugyldigt format '%s' (fejl i position %i).Ugyldig sgesti.janjanuarjuljulijunjuniList autodetekterede kameraerLista filer i mappeList mapper i mappenLister understttede kameramodellerLister understttede portenhederList indholdet af det nuvrende katalogLokalt katalog er nu '%s'.marmartsmajModelmanmandagNy fil er p stedet %s%s%s p kameraet -NejEj rekursion (standard for sletning)Ikke tilstrkkeligt med hukommelse.novnovemberAntal filer i mappen '%s': %i -Antal understttede kameraer: %i -OS/2-portering af Bart van Leeuwen -oktoktoberOperationen afbrudt.Operationen annulleret. -Overskriv filer uden at sprge.Sgesti Beskrivelse --------------------------------------------------------------- -PortPorte skal se ud som 'serial:/dev/ttyS0' eller 'usb:', men '%s' mangler et kolon s jeg vil gtte p hvad du mener.Tryk p en tast for at fortstte. -Skriv filstrrelse fr dataStille uddata (standard=snaksalig)Rekursion (standard for hjemhentning)Fjernkataloget er nu '%s'.Fjern et kataloglrlrdagGem fil som %s -Send fil til stdoutsepseptemberSerieportsunderstttelse : %s -Korte/lange flag (& argument) Beskrivelse --------------------------------------------------------------------------------- -Vis EXIF-informationVis kameradrivrutinens manualVis infoVis oversigtSpecificr et filnavnSpecificr kameramappe (standard="/")Specificr kameramodelSpecificr filnavn? Ja/Nej [y|n] Specificr portenhedSpecificr overfringshastighedSammenfatning af kamerastatussnsndagUnderstttede kameraer: -MrkeKommandoen '%s' krver et argument.Filnavnet leveret af kameraet ('%s') indeholder ikke en endelse!Den port du specificerede ('%s') kan ikke findes. Vr venlig at specificere en af de porte som findes af 'gphoto2 --list-ports' og forsikr dig om at stavningen er korrekt (dvs med prfikset 'serial:' eller 'usb:').Der findes %i filer i mappen '%s':Der findes %i mapper i mappen '%s':Der findes ingen filer i mappen '%s'.Der findes ingen mapper i mappen '%s'.Der findes en fil i mappen '%s':Der findes n mappe i mappen '%s':torMiniature: -torsdagTid:For at f hjlp om en speciel kommando s skriv 'help kommando-navn'.Overfringshastigheder som understttes : -tirtirsdagAktivr fejlsgningUSB-understttelse : %s -Oplg fil p kameraBrug:Brug: -Brug den flgende syntaks a:b=c:d for at behandle en USB-enhed detekteret som a:b som c:d i stedet. a b c d skal vre hexadecimale tal som begynder med '0x'. -VrdiVrdi: onsonsdagJaDu kan kun specificere hastigheder for serielle porte.Du kan ikke bruge '%n' i kombination med ikke-bestandige filer![kommando][katalog/][katalog/]filnavnsletkatalogfilnavnmappegPhoto sklgPhoto2 for OS/2 krver at du stter milj-variablen CAMLIBS til kataloget med kamera-bibliotekerne, fx SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 krver at du stter milj-variablen IOLIBS til kataloget med io-bibliotekerne, fx SET IOLIBS=C:\GPHOTO2\IOLIBS -gphoto2 er oversat uden EXIF understttelse.gphoto2 er blevet oversat uden understttelse for CDK.modelnavnnejingenstilsls/slethastighedusbidja \ No newline at end of file diff -Naur gphoto2-2.1.4/po/da.po gphoto2/po/da.po --- gphoto2-2.1.4/po/da.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/da.po 2004-03-22 01:01:44.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gphoto2 2.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-03-08 20:07+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -58,10 +58,12 @@ msgstr "Information om filen '%s' (mappe '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Fil:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " Ingen tilgngelig.\n" @@ -108,22 +110,27 @@ msgstr "nej" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Rettigheder: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "ls/slet" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "ls" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "slet" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "ingen" @@ -133,10 +140,12 @@ msgstr " Tid: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Miniature: \n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Lyddata:\n" @@ -160,6 +169,7 @@ msgstr "Kunne ikke tolke EXIF-data." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "EXIF-mrker:" @@ -186,6 +196,7 @@ msgstr "Antal understttede kameraer: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Understttede kameraer:\n" @@ -210,6 +221,7 @@ msgstr "Enheder fundet: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -231,6 +243,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -250,6 +263,7 @@ msgstr "USB-understttelse : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Overfringshastigheder som understttes : \n" @@ -259,27 +273,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Fangst-valg :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Billede\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Lyd\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Smugkig\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Smugkig\n" @@ -325,18 +344,22 @@ "stavningen er korrekt (dvs med prfikset 'serial:' eller 'usb:')." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "Om kameradrivrutinen:" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Kamera oversigt:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Kameramanual:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Du kan kun specificere hastigheder for serielle porte." @@ -345,7 +368,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -357,7 +380,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (C) 2000-2002 Lutz Mueller og andre\n" +"Copyright (C) 2000-2004 Lutz Mueller og andre\n" "%s\n" "gphoto2 kommer UDEN GARANTI, s vidt som lov tillader. Du m\n" "videredistribuere kopier af gphoto2 under betingelserne i GNU General " @@ -409,14 +432,17 @@ "frst." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Fejl *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Tryk p en tast for at fortstte.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Ikke tilstrkkeligt med hukommelse." @@ -650,6 +676,7 @@ msgstr "gPhoto skl" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -827,10 +854,12 @@ msgstr "Filen %s eksisterer. Overskriv? Ja/Nej [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Specificr filnavn? Ja/Nej [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Indtast nyt filnavn: " @@ -845,10 +874,12 @@ msgstr "Ny fil er p stedet %s%s%s p kameraet\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "FEJL:" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -857,10 +888,12 @@ "Afbryder...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Afbrudt.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -873,6 +906,7 @@ msgstr "gphoto2 er blevet oversat uden understttelse for CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operationen annulleret.\n" @@ -886,6 +920,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -945,6 +980,7 @@ msgstr "Om kameradrivrutinens manual" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -953,6 +989,7 @@ "med kamera-bibliotekerne, fx SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -961,10 +998,12 @@ "med io-bibliotekerne, fx SET IOLIBS=C:\\GPHOTO2\\IOLIBS\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Brug:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -978,6 +1017,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1144,21 +1184,26 @@ msgstr "Hjlp om \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Brug:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Beskrivelse:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Argumenter i klammer [] er valgfri." #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Tilgngelige kommandoer:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "For at f hjlp om en speciel kommando s skriv 'help kommando-navn'." diff -Naur gphoto2-2.1.4/po/de.gmo gphoto2/po/de.gmo --- gphoto2-2.1.4/po/de.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/de.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -= -&=)d)+)!3Odx  "J,w0#& *'Iq!;  S&& MWo N`u##(<Ge& )'B_rv& 5Ne* - $(!1&S&z    !!=![!t!! !(!!+! ""0"4"<"@"E"I"N"i"~"""*""###!#'#+#-2#`##c###### ## $$$+$A$la$$u$I%e%% %%%%%%&"& &&&0&W&&& ' '#'#6'Z'o''''''''&'E!(g("%)$H)"m)$)!)#)) ) **A*#]****&*****+++ ++-+=+ , ,%,:, A,K,T, [,h,,o|-/.2/O/U/Z/]/b/g/ l/x/~//F/0000 1&1)F1(p101)11 2$2@2T2g2|222222 3 3[3x3*3/3+34#440X44!44;4555 5]5&J6 q666666 66667 -77KR888888 959O9#h9)969f9&T: {:5:$::";';;;?;H;"P;%s;&; ;;;;<.<F<X<q<<<1< -<%<==0=4=1<=&n=&==+=>>#> ?!A?'c?&?#?$?*?&@16@h@/{@@@@@@@@"@@"A CCC.RDD$D)D$DE'E+E3E#KEoE sE&}EE&F"?F -bFmFF-FF FGG#9G]GaGiGG'GHGG'H-H(*I0SI*I,III -IIRJ#TJxJ|JJ&JJ J JJKKKKK9KNK=LFLULmL uL L L LL1MpM5-O4cOOOOOOO OOOOy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 2.1.2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-10-13 21:39+0200 -Last-Translator: Colin Marquardt -Language-Team: German -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit - %s - %s (EXPERIMENTELL) - %s (IM TEST) - -Harter Abbruch... - -Abbruch... - : %i - : Audio - : Bild - : Bildvorschau - : Video -Heruntergeladen: %s - Heruntergeladen: %s - Hhe: %i pixel(s) - MIME-Typ: %s - MIME-Typ: %s - Name: %s - Nicht verfgbar. - Berechtigungen: Gre: %li Byte(s) - Gre: %li byte(s) - Zeit: %s Breite: %i Pixel -%-30s %-16s -%-34s %s -%s Absteigende Bereiche sind nicht erlaubt. Sie mssen einen Bereich -von %i bis %i angeben.%s -Bild-ID %i zu gro.%s -Bilder-IDs mssen grer als Null sein.%s -Bereiche mssen mittels , getrennt werden.%s -Bereiche mssen mit einer Zahl beginnen.%s -Unerwartetes Zeichen %c.(fr Experten) berschreibe USB-IDs* Argumente in eckigen Klammern [] sind optional*** Fehler (%i: %s) ****** Fehler (%i: %s) *** - -*** Fehler *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Doppelte Anfhrungszeichen um Argumente] [Bildzhlung beginnt mit 1] -WeitermachenAbbrechenFehlerBITTE IMMER FOLGENDE ZEILE EINFGEN WENN DEBUG MESSAGES AN DIE MAILINGLISTE GESCHICKT WERDEN:Fhigkeiten fr Kamera : %s -Abgebrochen. -ber den KameratreiberDie Kameratreiberhilfe anzeigenber den KameratreiberAprAprilAudiodaten: -AugAugustVerfgbare Befehle:ZurckFehlerhafte Dateinummer. Sie gaben %i an, aber es gibt nur %i Dateien in %s oder seinen Unterverzeichnissen. Bite holen Sie zuerst eine gltige Dateinummer aus einer Dateiliste.Fehlerhafte Dateinummer. Sie gaben %i an, aber es gibt nur %i Dateien in %s. Bite holen Sie zuerst eine gltige Dateinummer aus einer Dateiliste.Fehlerhafte Dateinummer. Sie gaben %i an, aber es gibt nur 1 Datei in %s.Anleitung fr KameratreiberKameraanleitung:Kamerazusammenfassung:Eine Filmaufnahme machenEine Filmaufnahme machenMache eine Vorschaubild-AufnahmeEine Audioaufnahme machenEine Bildaufnahme machenAufnahme machen (Auswahl) : -Wechsle in ein Verzeichnis auf der KameraWechsle in ein Verzeichnis auf der lokalen Festplatte.Befehl %s nicht gefunden. Verwenden Sie help, um eine Liste aller verfgbaren Befehle zu erhalten.Konfigurationsuntersttzung : %s -KonfigurierenKonnte nicht in das lokale Verzeichnis %s wechseln.Konnte Heimverzeichnis nicht finden.Konnte EXIF-Daten nicht parsen.Konnte Konfiguration nicht setzen:Verzeichnis anlegenDezDezemberLschenLsche alle Dateien im VerzeichnisLsche Dateien im angegebenen BereichUntersttzung fr Bildlschung : %s -Beschreibung:Gefundene Gerte: %i -Zeige KamerafhigkeitenZeige Anzahl der DateienZeige Version und beendeZeige BefehlsverwendungZeigt diese HilfeLade eine Datei herunterLade ein Vorschaubild herunterLade Rohdaten herunterFEHLER: EXIF-Daten enthalten ein Vorschaubild (%i Bytes).EXIF-Tags:Geben Sie einen neuen Dateinamen an: BeendengPhoto-Shell beendenFebFebruarDatei %s existiert bereits. berschreiben? [y|n] Untersttzung fr Bildvorschau : %s -Untersttzung fr Bildhochladen : %s -Datei: -Fr Debug-Meldungen verwenden Sie bitte die Option --debug. -Diese Meldungen knnen Ihnen helfen, eine Lsung fr Ihr Problem zu -finden. Wenn Sie jedoch Fehler- oder Debug-Meldungen an die -Mailingliste schicken wollen, -so starten sie gphoto2 bitte wie folgt: - -FreFreitagHole alle Audiodaten im VerzeichnisHole alle Dateien im VerzeichnisHole alle Rohdaten im VerzeichnisHole alle Vorschaubilder im VerzeichnisHole Audiodaten im angegebenen BereichHole Dateien im angegebenen BereichHole Rohdaten im angegebenen BereichHole Vorschaubilder im angegebenen BereichHilfe fr "%s":Informationen fr Datei %s (Verzeichnis %s): -Ungltiger Befehl.Ungltiges Format %s (Fehler an Position %i).Ungltiger Pfad.JanJanuarJulJuliJunJuniListe automatisch erkannte KamerasListe Dateien in VerzeichnisListe Verzeichnisse in VerzeichnisZeige untersttzte KameramodelleListe untersttzte Port-GerteZeige den Inhalt des aktuellen VerzeichnissesLokales Verzeichnis ist nun %s.MrMrzMaiModellMonMontagNeue Datei ist in %s%s%s auf der Kamera -NeinKeine Rekursion (Vorgabe fr das Lschen)Ungengend Speicher.NovNovemberAnzahl der Dateien im Verzeichnis %s: %i -Anzahl der untersttzten Kameras: %i -OS/2-Portierung von Bart van Leeuwen -OktOktoberOperation abgebrochenOperation abgebrochen. -Dateien ohne Nachfragen berschreiben.Pfad Beschreibung ------------------------------------------------------------------------- -PortPorts mssen als serial:/dev/ttyS0 oder usb: angegeben werden, aber %s hat keinen Doppelpunkt. Es wird versucht, herauszufinden, was Sie meinen.Eine beliebige Taste drcken um fortzusetzen. -Dateigre vor Daten ausgebenWenige Ausgaben (Vorgabe=gesprchig)Rekursion (Vorgabe fr das Herunterladen)Entferntes Verzeichnis ist nun %s.Verzeichnis lschenSamSamstagSpeichere Datei als %s -Sende Datei auf die StandardausgabeSepSeptemberUntersttzung fr seriellen Port : %s -Kurze/lange Optionen (& Argument) Beschreibung --------------------------------------------------------------------------------- -Zeige EXIF-InformationenAnleitung fr Kameratreiber zeigenZeige InfoZusammenfassung zeigenAngabe des DateinamensAngabe des Kameraverzeichnisses (Vorgabe="/")Angabe des KameramodellsNeuen Dateinamen angeben? [y|n] Angabe des Port-GertsAngabe der seriellen DatenrateZusammenfassung des KamerastatussesSonSonntagUntersttzte Kameras: -TagDer Befehl %s erfordert ein Argument.Der von der Kamera gelieferte Filename (%s) enthlt keine Dateiendung.Der angegebene Port (%s) kann nicht gefunden werden. Bitte geben Sie einen -der von gphoto2 --list-ports gelisteten Ports an und stellen Sie sicher, -da die Schreibweise korrekt ist (mit Prfix serial: oder usb:).Es gibt %i Dateien im Verzeichnis %s:Es gibt %i Verzeichnisse im Verzeichnis %s:Es gibt keine Datei im Verzeichnis %s.Es gibt keine Verzeichnisse im Verzeichnis %s.Es gibt eine Datei im Verzeichnis %s an:Es gibt ein Verzeichnis im Verzeichnis %s:DonVorschaubild: -DonnerstagZeit: Um Hilfe zu einem bestimmten Befehl zu erhalten, verwenden Sie help Befehlsname.Untersttzte Datenraten (seriell): -DieDienstagSchalte Debugging einUSB-Untersttzung : %s -Datei auf Kamera hochladenVerwendung:Verwendung: -Verwenden Sie die Syntax a:b=c:d um ein als a:b erkanntes USB-Gert als c:d zu behandeln. -a b c d sind hexadezimale Angaben, die mit 0x beginnen mssen. -WertWert: MitMittwochJaNur mit seriellen Ports knnen Sie eine Datenrate setzen.Sie knnen %n nicht im Zusammenhang mit nicht-persistenten Dateien benutzen![Befehl][Verzeichnis/][Verzeichnis/]DateinameLschenVerzeichnisDateinameVerzeichnisgPhoto-ShellgPhoto2 fr OS/2 erfordert, da die Umgebungsvariable CAMLIBS auf den Ort der Kamerabibliotheken zeigt, z.B. mit SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 fr OS/2 erfordert, da die Umgebungsvariable IOLIBS auf den Ort der I/O-Bibliotheken zeigt, z.B. mit SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (C) 2000-2003 Lutz Mller und andere -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -Diese Version von gphoto2 benutzt die folgenden Softwareversionen und Optionen: -gphoto2 wurde ohne Untersttzung fr EXIF kompiliert.gphoto2 wurde ohne Untersttzung fr CDK kompiliert.ModellNameNeinKeinePfadLesenLesen/LschenBaudrateusbidJa \ No newline at end of file diff -Naur gphoto2-2.1.4/po/de.po gphoto2/po/de.po --- gphoto2-2.1.4/po/de.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/de.po 2004-03-22 01:01:44.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gphoto2 2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-10-13 21:39+0200\n" "Last-Translator: Colin Marquardt \n" "Language-Team: German \n" @@ -57,10 +57,12 @@ msgstr "Informationen fr Datei %s (Verzeichnis %s):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Datei:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " Nicht verfgbar.\n" @@ -107,22 +109,27 @@ msgstr "Nein" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Berechtigungen: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "Lesen/Lschen" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "Lesen" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "Lschen" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "Keine" @@ -132,10 +139,12 @@ msgstr " Zeit: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Vorschaubild:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Audiodaten:\n" @@ -159,6 +168,7 @@ msgstr "Konnte EXIF-Daten nicht parsen." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "EXIF-Tags:" @@ -185,6 +195,7 @@ msgstr "Anzahl der untersttzten Kameras: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Untersttzte Kameras:\n" @@ -209,6 +220,7 @@ msgstr "Gefundene Gerte: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -230,6 +242,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -249,6 +262,7 @@ msgstr "USB-Untersttzung : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Untersttzte Datenraten (seriell):\n" @@ -258,27 +272,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Aufnahme machen (Auswahl) :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Bild\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Audio\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Bildvorschau\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Bildvorschau\n" @@ -325,18 +344,22 @@ "da die Schreibweise korrekt ist (mit Prfix serial: oder usb:)." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "ber den Kameratreiber" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Kamerazusammenfassung:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Kameraanleitung:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Nur mit seriellen Ports knnen Sie eine Datenrate setzen." @@ -345,7 +368,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -357,7 +380,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (C) 2000-2003 Lutz Mller und andere\n" +"Copyright (C) 2000-2004 Lutz Mller und andere\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -408,14 +431,17 @@ "s. Bite holen Sie zuerst eine gltige Dateinummer aus einer Dateiliste." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Fehler *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Eine beliebige Taste drcken um fortzusetzen.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Ungengend Speicher." @@ -649,6 +675,7 @@ msgstr "gPhoto-Shell" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -830,10 +857,12 @@ msgstr "Datei %s existiert bereits. berschreiben? [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Neuen Dateinamen angeben? [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Geben Sie einen neuen Dateinamen an: " @@ -848,10 +877,12 @@ msgstr "Neue Datei ist in %s%s%s auf der Kamera\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "FEHLER: " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -860,10 +891,12 @@ "Harter Abbruch...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Abgebrochen.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -876,6 +909,7 @@ msgstr "gphoto2 wurde ohne Untersttzung fr CDK kompiliert." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operation abgebrochen.\n" @@ -889,6 +923,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -949,6 +984,7 @@ msgstr "Die Kameratreiberhilfe anzeigen" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -957,6 +993,7 @@ "der Kamerabibliotheken zeigt, z.B. mit SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -965,10 +1002,12 @@ "I/O-Bibliotheken zeigt, z.B. mit SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Verwendung:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -982,6 +1021,7 @@ msgstr "%-34s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1148,22 +1188,27 @@ msgstr "Hilfe fr \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Verwendung:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Beschreibung:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Argumente in eckigen Klammern [] sind optional" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Verfgbare Befehle:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Um Hilfe zu einem bestimmten Befehl zu erhalten, verwenden Sie help " diff -Naur gphoto2-2.1.4/po/en_GB.po gphoto2/po/en_GB.po --- gphoto2-2.1.4/po/en_GB.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/en_GB.po 2004-04-20 21:12:00.000000000 +0200 @@ -0,0 +1,1107 @@ +# English (British) translation for gphoto2 +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the gphoto2 package. +# Gareth Owen , 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gphoto2 2.1.2\n" +"POT-Creation-Date: 2003-08-10 20:58+0200\n" +"PO-Revision-Date: 2004-04-20 11:04-0400\n" +"Last-Translator: Gareth Owen \n" +"Language-Team: English (British) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "Number of files in folder '%s': %i\n" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "There are no folders in folder '%s'." + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "There is one folder in folder '%s':" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "There are %i folders in folder '%s':" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "There are no files in folder '%s'." + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "There is one file in folder '%s':" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "There are %i files in folder '%s':" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "Information on file '%s' (folder '%s'):\n" + +#: gphoto2/actions.c:190 +msgid "File:\n" +msgstr "File:\n" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +msgid " None available.\n" +msgstr " None available.\n" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr " Name: '%s'\n" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime type: '%s'\n" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Size: %li byte(s)\n" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr " Width: %i pixel(s)\n" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr " Height: %i pixel(s)\n" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Downloaded: %s\n" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "yes" +msgstr "yes" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "no" +msgstr "no" + +#: gphoto2/actions.c:208 +msgid " Permissions: " +msgstr " Permissions: " + +#: gphoto2/actions.c:211 +msgid "read/delete" +msgstr "read/delete" + +#: gphoto2/actions.c:213 +msgid "read" +msgstr "read" + +#: gphoto2/actions.c:215 +msgid "delete" +msgstr "delete" + +#: gphoto2/actions.c:217 +msgid "none" +msgstr "none" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr " Time: %s" + +#: gphoto2/actions.c:224 +msgid "Thumbnail:\n" +msgstr "Thumbnail:\n" + +#: gphoto2/actions.c:240 +msgid "Audio data:\n" +msgstr "Audio data:\n" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime type: '%s'\n" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Size: %li byte(s)\n" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Downloaded: %s\n" + +#: gphoto2/actions.c:380 +msgid "Could not parse EXIF data." +msgstr "Could not parse EXIF data." + +#: gphoto2/actions.c:384 +msgid "EXIF tags:" +msgstr "EXIF tags:" + +#: gphoto2/actions.c:387 +msgid "Tag" +msgstr "Tag" + +#: gphoto2/actions.c:389 +msgid "Value" +msgstr "Value" + +#: gphoto2/actions.c:410 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "EXIF data contains a thumbnail (%i bytes)." + +#: gphoto2/actions.c:419 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "gphoto2 has been compiled without EXIF support." + +#: gphoto2/actions.c:437 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "Number of supported cameras: %i\n" + +#: gphoto2/actions.c:439 +msgid "Supported cameras:\n" +msgstr "Supported cameras:\n" + +#: gphoto2/actions.c:452 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "\t\"%s\" (TESTING)\n" + +#: gphoto2/actions.c:455 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "\t\"%s\" (EXPERIMENTAL)\n" + +#: gphoto2/actions.c:460 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t\"%s\"\n" + +#: gphoto2/actions.c:488 +#, c-format +msgid "Devices found: %i\n" +msgstr "Devices found: %i\n" + +#: gphoto2/actions.c:489 +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" +"Path Description\n" +"--------------------------------------------------------------\n" + +#: gphoto2/actions.c:528 gphoto2/actions.c:533 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:528 +msgid "Model" +msgstr "Model" + +#: gphoto2/actions.c:528 +msgid "Port" +msgstr "Port" + +#: gphoto2/actions.c:529 +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:546 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "Abilities for camera : %s\n" + +#: gphoto2/actions.c:547 +#, c-format +msgid "Serial port support : %s\n" +msgstr "Serial port support : %s\n" + +#: gphoto2/actions.c:549 +#, c-format +msgid "USB support : %s\n" +msgstr "USB support : %s\n" + +#: gphoto2/actions.c:552 +msgid "Transfer speeds supported :\n" +msgstr "Transfer speeds supported :\n" + +#: gphoto2/actions.c:554 +#, c-format +msgid " : %i\n" +msgstr " : %i\n" + +#: gphoto2/actions.c:557 +msgid "Capture choices :\n" +msgstr "Capture choices :\n" + +#: gphoto2/actions.c:559 +msgid " : Image\n" +msgstr " : Image\n" + +#: gphoto2/actions.c:561 +msgid " : Video\n" +msgstr " : Video\n" + +#: gphoto2/actions.c:563 +msgid " : Audio\n" +msgstr " : Audio\n" + +#: gphoto2/actions.c:565 +msgid " : Preview\n" +msgstr " : Preview\n" + +#: gphoto2/actions.c:566 +#, c-format +msgid "Configuration support : %s\n" +msgstr "Configuration support : %s\n" + +#: gphoto2/actions.c:568 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "Delete files on camera support : %s\n" + +#: gphoto2/actions.c:571 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "File preview (thumbnail) support : %s\n" + +#: gphoto2/actions.c:574 +#, c-format +msgid "File upload support : %s\n" +msgstr "File upload support : %s\n" + +#: gphoto2/actions.c:591 +#, c-format +msgid "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." +msgstr "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." + +#: gphoto2/actions.c:630 +#, c-format +msgid "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." +msgstr "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." + +#: gphoto2/actions.c:668 +msgid "About the camera driver:" +msgstr "About the camera driver:" + +#: gphoto2/actions.c:682 +msgid "Camera summary:" +msgstr "Camera summary:" + +#: gphoto2/actions.c:696 +msgid "Camera manual:" +msgstr "Camera manual:" + +#: gphoto2/actions.c:712 +msgid "You can only specify speeds for serial ports." +msgstr "You can only specify speeds for serial ports." + +#: gphoto2/actions.c:763 +#, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" +msgstr "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"Licence. For more information about these matters, see the files named COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" + +#: gphoto2/actions.c:776 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "OS/2 port by Bart van Leeuwen\n" + +#: gphoto2/actions.c:890 +msgid "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" +msgstr "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." +msgstr "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." + +#: gphoto2/foreach.c:283 +#, c-format +msgid "Bad file number. You specified %i, but there is only 1 file available in '%s'." +msgstr "Bad file number. You specified %i, but there is only 1 file available in '%s'." + +#: gphoto2/foreach.c:291 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." +msgstr "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." + +#: gphoto2/gp-params.c:53 +msgid "*** Error *** \n" +msgstr "*** Error *** \n" + +#: gphoto2/gp-params.c:220 +msgid "Press any key to continue.\n" +msgstr "Press any key to continue.\n" + +#: gphoto2/gp-params.c:237 +msgid "Not enough memory." +msgstr "Not enough memory." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Operation cancelled" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Continue" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Cancel" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Error" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Could not set configuration:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Exit" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Back" + +#: gphoto2/gphoto2-cmd-config.c:253 +msgid "Time: " +msgstr "Time: " + +#: gphoto2/gphoto2-cmd-config.c:312 gphoto2/gphoto2-cmd-config.c:340 +#: gphoto2/gphoto2-cmd-config.c:400 gphoto2/gphoto2-cmd-config.c:463 +msgid "Value: " +msgstr "Value: " + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "Yes" +msgstr "Yes" + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "No" +msgstr "No" + +#: gphoto2/main.c:161 gphoto2/main.c:1461 +msgid "Turn on debugging" +msgstr "Turn on debugging" + +#: gphoto2/main.c:162 gphoto2/main.c:1463 +msgid "Quiet output (default=verbose)" +msgstr "Quiet output (default=verbose)" + +#: gphoto2/main.c:166 gphoto2/main.c:1467 +msgid "Display version and exit" +msgstr "Display version and exit" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Displays this help screen" + +#: gphoto2/main.c:168 gphoto2/main.c:1469 +msgid "List supported camera models" +msgstr "List supported camera models" + +#: gphoto2/main.c:169 gphoto2/main.c:1471 +msgid "List supported port devices" +msgstr "List supported port devices" + +#: gphoto2/main.c:170 gphoto2/main.c:1473 +msgid "Send file to stdout" +msgstr "Send file to stdout" + +#: gphoto2/main.c:171 gphoto2/main.c:1475 +msgid "Print filesize before data" +msgstr "Print filesize before data" + +#: gphoto2/main.c:172 gphoto2/main.c:1477 +msgid "List auto-detected cameras" +msgstr "List auto-detected cameras" + +#: gphoto2/main.c:175 gphoto2/main.c:1479 +msgid "Specify port device" +msgstr "Specify port device" + +#: gphoto2/main.c:176 gphoto2/main.c:1481 +msgid "Specify serial transfer speed" +msgstr "Specify serial transfer speed" + +#: gphoto2/main.c:177 gphoto2/main.c:1483 +msgid "Specify camera model" +msgstr "Specify camera model" + +#: gphoto2/main.c:178 gphoto2/main.c:1485 +msgid "Specify a filename" +msgstr "Specify a filename" + +#: gphoto2/main.c:179 gphoto2/main.c:1487 +msgid "(expert only) Override USB IDs" +msgstr "(expert only) Override USB IDs" + +#: gphoto2/main.c:182 gphoto2/main.c:1489 +msgid "Display camera abilities" +msgstr "Display camera abilities" + +#: gphoto2/main.c:183 gphoto2/main.c:1491 +msgid "Specify camera folder (default=\"/\")" +msgstr "Specify camera folder (default=\"/\")" + +#: gphoto2/main.c:184 gphoto2/main.c:1493 +msgid "Recursion (default for download)" +msgstr "Recursion (default for download)" + +#: gphoto2/main.c:185 gphoto2/main.c:1495 +msgid "No recursion (default for deletion)" +msgstr "No recursion (default for deletion)" + +#: gphoto2/main.c:186 gphoto2/main.c:1497 +msgid "List folders in folder" +msgstr "List folders in folder" + +#: gphoto2/main.c:187 gphoto2/main.c:1499 +msgid "List files in folder" +msgstr "List files in folder" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "name" + +#: gphoto2/main.c:188 gphoto2/main.c:1501 +msgid "Create a directory" +msgstr "Create a directory" + +#: gphoto2/main.c:189 gphoto2/main.c:1503 +msgid "Remove a directory" +msgstr "Remove a directory" + +#: gphoto2/main.c:190 gphoto2/main.c:1505 +msgid "Display number of files" +msgstr "Display number of files" + +#: gphoto2/main.c:191 gphoto2/main.c:1507 +msgid "Get files given in range" +msgstr "Get files given in range" + +#: gphoto2/main.c:192 gphoto2/main.c:1509 +msgid "Get all files from folder" +msgstr "Get all files from folder" + +#: gphoto2/main.c:193 gphoto2/main.c:1511 +msgid "Get thumbnails given in range" +msgstr "Get thumbnails given in range" + +#: gphoto2/main.c:194 gphoto2/main.c:1514 +msgid "Get all thumbnails from folder" +msgstr "Get all thumbnails from folder" + +#: gphoto2/main.c:195 gphoto2/main.c:1517 +msgid "Get raw data given in range" +msgstr "Get raw data given in range" + +#: gphoto2/main.c:196 gphoto2/main.c:1520 +msgid "Get all raw data from folder" +msgstr "Get all raw data from folder" + +#: gphoto2/main.c:197 gphoto2/main.c:1523 +msgid "Get audio data given in range" +msgstr "Get audio data given in range" + +#: gphoto2/main.c:198 gphoto2/main.c:1526 +msgid "Get all audio data from folder" +msgstr "Get all audio data from folder" + +#: gphoto2/main.c:199 gphoto2/main.c:1528 +msgid "Delete files given in range" +msgstr "Delete files given in range" + +#: gphoto2/main.c:200 gphoto2/main.c:1530 +msgid "Delete all files in folder" +msgstr "Delete all files in folder" + +#: gphoto2/main.c:201 gphoto2/main.c:1532 +msgid "Upload a file to camera" +msgstr "Upload a file to camera" + +#: gphoto2/main.c:203 gphoto2/main.c:1535 +msgid "Configure" +msgstr "Configure" + +#: gphoto2/main.c:205 gphoto2/main.c:1539 +msgid "Capture a quick preview" +msgstr "Capture a quick preview" + +#: gphoto2/main.c:206 gphoto2/main.c:1541 +msgid "Capture an image" +msgstr "Capture an image" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Capture a movie " + +#: gphoto2/main.c:208 gphoto2/main.c:1545 +msgid "Capture an audio clip" +msgstr "Capture an audio clip" + +#: gphoto2/main.c:210 gphoto2/main.c:1548 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "Show EXIF information" + +#: gphoto2/main.c:212 gphoto2/main.c:1551 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Show info" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "Summary of camera status" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "Camera driver manual" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "About the camera driver" + +#: gphoto2/main.c:216 gphoto2/main.c:1559 +msgid "gPhoto shell" +msgstr "gPhoto shell" + +#: gphoto2/main.c:343 gphoto2/main.c:1192 +msgid "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "Jan" + +#: gphoto2/main.c:466 +msgid "January" +msgstr "January" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "Feb" + +#: gphoto2/main.c:467 +msgid "February" +msgstr "February" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "Mar" + +#: gphoto2/main.c:468 +msgid "March" +msgstr "March" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "Apr" + +#: gphoto2/main.c:469 +msgid "April" +msgstr "April" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "May" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "Jun" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "June" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "Jul" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "July" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "Aug" + +#: gphoto2/main.c:473 +msgid "August" +msgstr "August" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "Sep" + +#: gphoto2/main.c:474 +msgid "September" +msgstr "September" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "Oct" + +#: gphoto2/main.c:475 +msgid "October" +msgstr "October" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "Nov" + +#: gphoto2/main.c:476 +msgid "November" +msgstr "November" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "Dec" + +#: gphoto2/main.c:477 +msgid "December" +msgstr "December" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "Sun" + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "Sunday" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "Mon" + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "Monday" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "Tue" + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "Tuesday" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "Wed" + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "Wednesday" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "Thu" + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "Thursday" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "Fri" + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "Friday" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "Sat" + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "Saturday" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "You cannot use '%n' in combination with non-persistent files!" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "The filename provided by the camera ('%s') does not contain a suffix!" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "Invalid format '%s' (error at position %i)." + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "File %s exists. Overwrite? [y|n] " + +#: gphoto2/main.c:712 +msgid "Specify new filename? [y|n] " +msgstr "Specify new filename? [y|n] " + +#: gphoto2/main.c:721 +msgid "Enter new filename: " +msgstr "Enter new filename: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Saving file as %s\n" + +#: gphoto2/main.c:918 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "New file is in location %s%s%s on the camera\n" + +#: gphoto2/main.c:1050 +msgid "ERROR: " +msgstr "ERROR: " + +#: gphoto2/main.c:1073 +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Aborting...\n" + +#: gphoto2/main.c:1079 +msgid "Aborted.\n" +msgstr "Aborted.\n" + +#: gphoto2/main.c:1084 +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Cancelling...\n" + +#: gphoto2/main.c:1291 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "gphoto2 has been compiled without support for CDK." + +#: gphoto2/main.c:1404 +msgid "Operation cancelled.\n" +msgstr "Operation cancelled.\n" + +#: gphoto2/main.c:1408 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Error (%i: '%s') *** \n" +"\n" + +#: gphoto2/main.c:1412 +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" + +#: gphoto2/main.c:1465 +msgid "Overwrite files without asking." +msgstr "Overwrite files without asking." + +#: gphoto2/main.c:1479 +msgid "path" +msgstr "path" + +#: gphoto2/main.c:1481 +msgid "speed" +msgstr "speed" + +#: gphoto2/main.c:1483 +msgid "model" +msgstr "model" + +#: gphoto2/main.c:1485 +msgid "filename" +msgstr "filename" + +#: gphoto2/main.c:1487 +msgid "usbid" +msgstr "usbid" + +#: gphoto2/main.c:1491 +msgid "folder" +msgstr "folder" + +#: gphoto2/main.c:1543 +msgid "Capture a movie" +msgstr "Capture a movie" + +#: gphoto2/main.c:1553 +msgid "Show summary" +msgstr "Show summary" + +#: gphoto2/main.c:1555 +msgid "Show camera driver manual" +msgstr "Show camera driver manual" + +#: gphoto2/main.c:1557 +msgid "About the camera driver manual" +msgstr "About the camera driver manual" + +#: gphoto2/main.c:1784 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "gPhoto2 for OS/2 requires you to set the environment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" + +#: gphoto2/main.c:1794 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "gPhoto2 for OS/2 requires you to set the environment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" + +#: gphoto2/options.c:181 +msgid "Usage:\n" +msgstr "Usage:\n" + +#: gphoto2/options.c:184 +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" +msgstr "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" +"%s\n" +"Image IDs must be a number greater than zero." + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" +"%s\n" +"Image ID %i too high." + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" +"%s\n" +"Ranges must be separated by ','." + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" +"%s\n" +"Ranges need to start with a number." + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" +"%s\n" +"Unexpected character '%c'." + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Error (%i: '%s') ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Change to a directory on the camera" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "directory" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Change to a directory on the local drive" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "Exit the gPhoto shell" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Download a file" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[directory/]filename" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Download a thumbnail" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Download raw data" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Delete" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Displays command usage" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[command]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "List the contents of the current directory" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[directory/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "Invalid command." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "The command '%s' requires an argument." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "Invalid path." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "Could not find home directory." + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "Could not change to local directory '%s'." + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "Local directory now '%s'." + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "Remote directory now '%s'." + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "Command '%s' not found. Use 'help' to get a list of available commands." + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "Help on \"%s\":" + +#: gphoto2/shell.c:743 +msgid "Usage:" +msgstr "Usage:" + +#: gphoto2/shell.c:747 +msgid "Description:" +msgstr "Description:" + +#: gphoto2/shell.c:749 +msgid "* Arguments in brackets [] are optional" +msgstr "* Arguments in brackets [] are optional" + +#: gphoto2/shell.c:770 +msgid "Available commands:" +msgstr "Available commands:" + +#: gphoto2/shell.c:775 +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "To get help on a particular command, type in 'help command-name'." diff -Naur gphoto2-2.1.4/po/es.gmo gphoto2/po/es.gmo --- gphoto2-2.1.4/po/es.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/es.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,181 +0,0 @@ -= -&=)d)+)!3Odx  "J,w0#& *'Iq!;  S&& MWo N`u##(<Ge& )'B_rv& 5Ne* - $(!1&S&z    !!=![!t!! !(!!+! ""0"4"<"@"E"I"N"i"~"""*""###!#'#+#-2#`##c###### ## $$$+$A$la$$u$I%e%% %%%%%%&"& &&&0&W&&& ' '#'#6'Z'o''''''''&'E!(g("%)$H)"m)$)!)#)) ) **A*#]****&*****+++ ++-+=+ , ,%,:, A,K,T, [,h,,o|-/.2/O/U/Z/]/b/g/ l/x/~//[/0011"1-210`111<10212D2V2r2222 222 33 93 F3OP338303/)4Y4&v4244!4 5;(5d566 %6p26-6 6#6.7$17V7Z7`7q7u7|777b8]9#t999999:):*=:$h:):b:-; -H;-S;+;%;%;; < <<'"<!J<-l< <<$<< -=%=D=c=x===4==$= >&>B>F>,N>-{>-> >T>6@:@.B@(q@*@,@(@"A*>A&iAA2AA-AB&B*B0B4B:B>B-DB!rB!B&B$B+C".CQCUC[C_CfCjC:pCC+CCC C*D-.D$\DDDDD%DlDJEQE)E1F'9F(aF#FFFFF#FG -G-GLGG+GH-H =H(^H"H/H%H/I0IPITI\IqI&zIJII#J$J#K#8K"\K$KKKKKUK*LFLJLQL-gLLLLLnMtM|M MM6M7M M NN)N -1NgJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-07-10 14:08-0300 -Last-Translator: Fabian Mandelbaum -Language-Team: Espaol -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit -X-Generator: KBabel 1.1 - "%s" - "%s" (EXPERIMENTAL) - "%s" (PRUEBA) - -Abandonando... - -Cancelando... - : %i - : Audio - : Imagen - : Pre-visualizacin - : Vdeo - Descargado: %s - Descargado: %s - Alto: %i pixel(s) - Tipo MIME : '%s' - Tipo MIME : '%s' - Nombre: '%s' - Ninguno disponible. - Permisos: Tamao: %li byte(s) - Tamao: %li byte(s) - Hora: %s Ancho: %i pixel(s) -%-30s %-16s -%-32s %s -%s -Los rangos decrecientes no estn permitidos. Especific un rango de %i a %i.%s -ID de imagen %i muy grande.%s -Los ID de imagen deben ser un nmero superior a cero.%s -Los intervalos deben estar separados por ','.%s -Los intervalos deben comenzar con un nmero.%s -Caracter inesperado '%c'.(slo expertos) Ignorar los IDs de USB* Los argumentos entre corchetes [] son opcionales*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Usar comillas para los arg.] [Los nmeros de imagen comienzan con un (1)] -ContinuarCancelarErrorSIEMPRE INCLUYA LAS LNEAS SIGUIENTES CUANDO ENVE MENSAJES DE DEPURACIN A LA LISTA DE DISTRIBUCIN DE CORREOS:Capacidades de la cmara : %s -Abandonado. -Acerca del controlador de la cmaraAcerca del manual del controlador de la cmaraAcerca del controlador de la cmara:AbrAbrilDatos de audio: -AgoAgostoComandos disponibles:RegresarNmero de archivo incorrecto. Usted especific %i, pero slo hay %i archivos disponibles en '%s' o las sub-carpetas. Por favor, primero obtenga un nmero de archivo vlido de un listado de archivos.Nmero de archivo incorrecto. Usted especific %i, pero slo hay %i archivos disponibles en '%s'. Por favor, primero obtenga un nmero de archivo vlido de un listado de archivos.Nmero de archivo incorrecto. Usted especific %i, pero slo hay 1 archivo disponible en '%s'Manual del controlador de la cmaraManual de la cmara:Resumen de la cmara:Capturar una pelculaCapturar una pelcula Capturar una pre-visualizacinCapturar un clip de audioCapturar una imagenOpciones de captura : -Cambiar a un directorio en la cmaraCambiar a un directorio en el disco localNo se encontr el comando '%s'. Utilice 'help' para obtener una lista de los comandos disponibles.Soporte de configuracin : %s -ConfigurarNo se puede cambiar al directorio local '%s'.No se puede encontrar la carpeta principal.No se pueden analizar los datos EXIF.No se puede aplicar la configuracin:Crear un directorioDicDiciembreBorrarBorrar todos los archivos de la carpetaBorrar los archivos del intervaloSoporte de borrado de archivo en cmara : %s -Descripcin:Dispositivos encontrados: %i -Mostrar las capacidades de la cmaraMostrar la cantidad de archivosMostrar la versin y salirMostrar el uso de los comandosMuestra esta pantalla de ayudaDescargar un archivoDescargar una diapositivaDescargar datos "en crudo"ERROR: Los datos EXIF contienen una diapositiva (%i bytes).Etiquetas EXIF :Ingrese el nombre de archivo nuevo: SalirSalir del intrprete gPhotoFebFebreroEl archivo %s existe. Sobreescribir? [y|n] Soporte de diapositivas : %s -Soporte de envo de archivos : %s -Archivo: -Por favor, utilice la opcin --debug para obtener los mensajes de depuracin. -Estos mensajes pueden ayudar a encontrar la solucin a su problema. -Si intenta enviar cualquier mensaje de error o de depuracin a la lista -de distribucin de desarrolladores de gPhoto , -por favor ejecute gphoto2 como sigue: - -VieViernesObtener todos los datos de audio de la carpetaObtener todos los archivos de la carpetaObtener los datos "en crudo" de la carpetaObtener todas las diapositivas de la carpetaObtener los datos de audio del intervaloObtener los archivos del intervaloObtener los datos "en crudo" del intervaloOntener las diapositivas del intervaloAyuda sobre "%s":Informacin sobre el archivo '%s' (carpeta '%s'): -Comando no vlido.Formato '%s' no vlido (error en posicin %i)Ruta no vlida.EneEneroJulJulioJunJunioListar las cmaras detectadas automticamenteListar lso archivos en la carpetaListar las carpetas en la carpetaLista los modelos de cmara soportadosLista los tipos de puerto soportadosLista el contenido del directorio corrienteAhora el directorio local es '%s'.MarMarzoMayModeloLunLunesEl archivo nuevo est en la ubicacin %s%s%s en la cmara -NoSin recursin (por defecto para el borrado)No hay memoria suficiente.NovNoviembreCantidad de archivos en la carpeta %s: %i -Cantidad de cmaras soportadas : %i -Portado a OS/2 por Bart van Leeuwen -OctOctubreOperacin canceladaOperacin cancelada. -Sobreescribir archivos sin preguntar.Ruta Descripcin --------------------------------------------------------------- -PuertoLos puertos deben lucir como serial:/dev/ttyS0 o usb:, pero falta un : en '%s' por lo que voy a intentar adivinar lo que quiso decir.Presione cualquier tecla para continuar. -Mostrar el tamao del archivo antes que los datosSalida silenciosa (por defecto=verbosa)Recursin (por defecto para la descarga)Ahora el directorio remoto es '%s'.Eliminar un directorioSbSbadoGuardando archivo como %s -Enviar archivo a la salida estndarSepSeptiembreSoporte de puerto serie : %s -Opciones cortas/largas (& argumento) Descripcin --------------------------------------------------------------------------------- -Mostrar la informacin EXIFMostrar manual del controlador de la cmaraMostrar informacinMostrar resumenEspecificar un nombre de archivoEspecificar la carpeta (por defecto="/")Especificar el modelo de la cmaraEspecificar un nombre de archivo nuevo? [y|n] Especificar el puerto del dispositivoEspecificar la velocidad de transferencia serieResumen del estado de la cmaraDomDomingoCmaras soportadas: -EtiquetaEl comando '%s' necesita un argumento.El nombre de archivo provisto por la cmara ('%s') no contiene un sufijo!No se puede encontrar el puerto que especific ('%s'). Por favor, especifique uno de los puertos encontrados por gphoto2 --list-ports y asegrese que la sintaxis es correcta (es decir, con el prefijo 'serial:' o 'usb:'.)Hay %i archivos en la carpeta '%s'.Hay %i carpetas en la carpeta '%s' :No hay archivos en la carpeta '%s'.No hay carpetas en la carpeta '%s'.Hay un archivo en la carpeta '%s'.Hay una carpeta en la carpeta '%s' :JueDiapositiva: -JuevesHora: Para obtener ayuda sobre un comando en particular, ingrese 'help nombre-del-comando'.Velocidades de transferencia soportadas : -MarMartesActivar la depuracinSoporte de puerto USB : %s -Enviar un archivo a la cmaraUso:Uso: -Utilice la sintaxis a:b=c:d para tratar a cualquier dispositivo USB detectado como a:b como si fuera c:d. a b c y d deberan ser nmeros hexadecimales que comienzan con '0x'. -ValorValor: MiMircolesSSlo puede especificar velocidades para puertos serie.No puede usar '%n' junto con archivos no persistentes![comando][directorio/][directorio/]archivoborradodirectorionombre de archivocarpetaIntrprete gPhotogPhoto2 para OS/2 necesita que configure la variable de entorno CAMLIBS con la ubicacin de las bibliotecas de soporte de las cmaras. Por ejemplo SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 para OS/2 necesita que configure la variable de entorno IOLIBS con la ubicacin de las bibliotecas de comunicacin. Por ejemplo SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller y otros -%s -gphoto2 viene SIN GARANTA, tanto como lo permite la ley. Puede -volver a distribuir copias de gphoto2 bajo los trminos de la Licencia Pblica -General GNU. Para ms informacin acerca de esots temas, consulte el archivo denominado COPYING - -Esta versin de gphoto2 est utilizando las siguientes versiones y opciones de software: -gphoto2 ha sido compilado sin soporte para EXIF.gphoto2 ha sido compilado sin soporte para CDK.modelonombrenoningunorutalecturalectura/borradovelocidadusbids \ No newline at end of file diff -Naur gphoto2-2.1.4/po/es.po gphoto2/po/es.po --- gphoto2-2.1.4/po/es.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/es.po 2004-05-11 20:32:36.000000000 +0200 @@ -1,63 +1,64 @@ -# translation of gphoto2-es.po to Espaol -# Traduccin al castellano -# Copyright 2002-2003 Fabian Mandelbaum +# Translation of gPhoto2 to Spanish +# Traduccin al castellano de gPhoto2 +# Copyright (C) 2002 Fabian Mandelbaum +# Quique , 2004. # msgid "" msgstr "" -"Project-Id-Version: gphoto2\n" +"Project-Id-Version: gphoto2 2.1.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-01-18 21:01+0100\n" -"PO-Revision-Date: 2003-07-10 14:08-0300\n" -"Last-Translator: Fabian Mandelbaum \n" -"Language-Team: Espaol \n" +"PO-Revision-Date: 2004-05-11 13:19+0200\n" +"Last-Translator: Quique \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.1\n" +"X-Generator: KBabel 1.3.1\n" #: gphoto2/actions.c:101 #, c-format msgid "Number of files in folder '%s': %i\n" -msgstr "Cantidad de archivos en la carpeta %s: %i\n" +msgstr "Cantidad de ficheros que hay en la carpeta %s: %i\n" #: gphoto2/actions.c:122 #, c-format msgid "There are no folders in folder '%s'." -msgstr "No hay carpetas en la carpeta '%s'." +msgstr "No hay ninguna carpeta en la carpeta %s." #: gphoto2/actions.c:126 #, c-format msgid "There is one folder in folder '%s':" -msgstr "Hay una carpeta en la carpeta '%s' :" +msgstr "Hay una carpeta en la carpeta %s:" #: gphoto2/actions.c:130 #, c-format msgid "There are %i folders in folder '%s':" -msgstr "Hay %i carpetas en la carpeta '%s' :" +msgstr "Hay %i carpetas en la carpeta %s:" #: gphoto2/actions.c:157 gphoto2/foreach.c:277 #, c-format msgid "There are no files in folder '%s'." -msgstr "No hay archivos en la carpeta '%s'." +msgstr "No hay ningn fichero en la carpeta %s." #: gphoto2/actions.c:162 #, c-format msgid "There is one file in folder '%s':" -msgstr "Hay un archivo en la carpeta '%s'." +msgstr "Hay un fichero en la carpeta %s:" #: gphoto2/actions.c:167 #, c-format msgid "There are %i files in folder '%s':" -msgstr "Hay %i archivos en la carpeta '%s'." +msgstr "Hay %i ficheros en la carpeta %s:" #: gphoto2/actions.c:188 #, c-format msgid "Information on file '%s' (folder '%s'):\n" -msgstr "Informacin sobre el archivo '%s' (carpeta '%s'):\n" +msgstr "Informacin sobre el fichero %s (carpeta %s):\n" #: gphoto2/actions.c:190 msgid "File:\n" -msgstr "Archivo:\n" +msgstr "Fichero:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 msgid " None available.\n" @@ -66,12 +67,12 @@ #: gphoto2/actions.c:195 #, c-format msgid " Name: '%s'\n" -msgstr " Nombre: '%s'\n" +msgstr " Nombre: %s\n" #: gphoto2/actions.c:197 gphoto2/actions.c:229 #, c-format msgid " Mime type: '%s'\n" -msgstr " Tipo MIME : '%s'\n" +msgstr " Tipo MIME: %s\n" #: gphoto2/actions.c:199 gphoto2/actions.c:231 #, c-format @@ -81,12 +82,12 @@ #: gphoto2/actions.c:201 gphoto2/actions.c:233 #, c-format msgid " Width: %i pixel(s)\n" -msgstr " Ancho: %i pixel(s)\n" +msgstr " Anchura: %i pxel(es)\n" #: gphoto2/actions.c:203 gphoto2/actions.c:235 #, c-format msgid " Height: %i pixel(s)\n" -msgstr " Alto: %i pixel(s)\n" +msgstr " Altura: %i pxel(es)\n" #: gphoto2/actions.c:205 gphoto2/actions.c:237 #, c-format @@ -125,6 +126,7 @@ msgid "none" msgstr "ninguno" +# He comprobado que en otros idiomas lo traducen como "hora". #: gphoto2/actions.c:221 #, c-format msgid " Time: %s" @@ -132,7 +134,7 @@ #: gphoto2/actions.c:224 msgid "Thumbnail:\n" -msgstr "Diapositiva: \n" +msgstr "Miniatura:\n" #: gphoto2/actions.c:240 msgid "Audio data:\n" @@ -141,7 +143,7 @@ #: gphoto2/actions.c:245 #, c-format msgid " Mime type: '%s'\n" -msgstr " Tipo MIME : '%s'\n" +msgstr " Tipo MIME: %s\n" #: gphoto2/actions.c:247 #, c-format @@ -155,11 +157,11 @@ #: gphoto2/actions.c:392 msgid "Could not parse EXIF data." -msgstr "No se pueden analizar los datos EXIF." +msgstr "No se han podido analizar los datos EXIF." #: gphoto2/actions.c:396 msgid "EXIF tags:" -msgstr "Etiquetas EXIF :" +msgstr "Etiquetas EXIF:" #: gphoto2/actions.c:399 msgid "Tag" @@ -172,7 +174,7 @@ #: gphoto2/actions.c:422 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." -msgstr "Los datos EXIF contienen una diapositiva (%i bytes)." +msgstr "Los datos EXIF contienen una miniatura (%i bytes)." #: gphoto2/actions.c:431 msgid "gphoto2 has been compiled without EXIF support." @@ -181,7 +183,7 @@ #: gphoto2/actions.c:449 #, c-format msgid "Number of supported cameras: %i\n" -msgstr "Cantidad de cmaras soportadas : %i\n" +msgstr "Nmero de cmaras soportadas : %i\n" #: gphoto2/actions.c:451 msgid "Supported cameras:\n" @@ -274,13 +276,11 @@ #: gphoto2/actions.c:584 msgid " : Preview\n" -msgstr " : Pre-visualizacin\n" +msgstr " : Previsualizacin\n" #: gphoto2/actions.c:588 -#, fuzzy -msgid "" -" : Capture not supported by the driver\n" -msgstr " : Pre-visualizacin\n" +msgid " : Capture not supported by the driver\n" +msgstr " :Captura no soportada por el controlador\n" #: gphoto2/actions.c:590 #, c-format @@ -290,17 +290,17 @@ #: gphoto2/actions.c:592 #, c-format msgid "Delete files on camera support : %s\n" -msgstr "Soporte de borrado de archivo en cmara : %s\n" +msgstr "Soporte de borrado de ficheros en cmara: %s\n" #: gphoto2/actions.c:595 #, c-format msgid "File preview (thumbnail) support : %s\n" -msgstr "Soporte de diapositivas : %s\n" +msgstr "Soporte de miniaturas : %s\n" #: gphoto2/actions.c:598 #, c-format msgid "File upload support : %s\n" -msgstr "Soporte de envo de archivos : %s\n" +msgstr "Soporte de envo de ficheros : %s\n" #: gphoto2/actions.c:615 #, c-format @@ -308,8 +308,9 @@ "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a " "colon so I am going to guess what you mean." msgstr "" -"Los puertos deben lucir como serial:/dev/ttyS0 o usb:, pero falta un : " -"en '%s' por lo que voy a intentar adivinar lo que quiso decir." +"Los puertos deben tener un aspecto tal como serial:/dev/ttyS0 o usb:, " +"pero falta un : en %s por lo que se va a intentar adivinar lo que quiso " +"decir." #: gphoto2/actions.c:654 #, c-format @@ -318,10 +319,10 @@ "ports found by 'gphoto2 --list-ports' and make sure the spelling is correct " "(i.e. with prefix 'serial:' or 'usb:')." msgstr "" -"No se puede encontrar el puerto que especific ('%s'). Por favor, " +"No se puede encontrar el puerto que ha especificado (%s). Por favor, " "especifique uno de los puertos encontrados por gphoto2 --list-ports y " -"asegrese que la sintaxis es correcta (es decir, con el prefijo 'serial:' o " -"'usb:'.)" +"asegrese de que la sintaxis es correcta (es decir, con el prefijo serial: " +"o usb:)." #: gphoto2/actions.c:692 msgid "About the camera driver:" @@ -337,7 +338,7 @@ #: gphoto2/actions.c:736 msgid "You can only specify speeds for serial ports." -msgstr "Slo puede especificar velocidades para puertos serie." +msgstr "La velocidad slo se puede especificar para los puertos serie." #: gphoto2/actions.c:787 #, c-format @@ -358,26 +359,26 @@ "\n" "Copyright (c) 2000-2003 Lutz Mueller y otros\n" "%s\n" -"gphoto2 viene SIN GARANTA, tanto como lo permite la ley. Puede\n" -"volver a distribuir copias de gphoto2 bajo los trminos de la Licencia " -"Pblica\n" -"General GNU. Para ms informacin acerca de esots temas, consulte el archivo " -"denominado COPYING\n" +"gphoto2 se entrega SIN NINGUNA GARANTA, hasta el punto permitido por la " +"ley.\n" +"Usted puede distribuir copias de gphoto2 bajo los trminos de la Licencia\n" +"Pblica General de GNU. Para ms informacin al respecto, consulte los\n" +"ficheros llamados COPYING.\n" "\n" -"Esta versin de gphoto2 est utilizando las siguientes versiones y opciones " -"de software:\n" +"Esta versin de gphoto2 usa las siguientes versiones de software y " +"opciones:\n" #: gphoto2/actions.c:800 msgid "OS/2 port by Bart van Leeuwen\n" -msgstr "Portado a OS/2 por Bart van Leeuwen\n" +msgstr "Adaptado a OS/2 por Bart van Leeuwen\n" #: gphoto2/actions.c:915 msgid "" "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE " "MAILING LIST:" msgstr "" -"SIEMPRE INCLUYA LAS LNEAS SIGUIENTES CUANDO ENVE MENSAJES DE DEPURACIN A " -"LA LISTA DE DISTRIBUCIN DE CORREOS:" +"INCLUYA SIEMPRE LA SIGUIENTE LNEA CUANDO ENVE MENSAJES DE DEPURACIN A LA " +"LISTA DE DISTRIBUCIN DE CORREO:" #: gphoto2/foreach.c:254 #, c-format @@ -386,9 +387,9 @@ "'%s' or its subfolders. Please obtain a valid file number from a file " "listing first." msgstr "" -"Nmero de archivo incorrecto. Usted especific %i, pero slo hay %i archivos " -"disponibles en '%s' o las sub-carpetas. Por favor, primero obtenga un nmero " -"de archivo vlido de un listado de archivos." +"Nmero de fichero incorrecto. Ha indicado %i, pero slo hay %i ficheros " +"disponibles en %s o sus subcarpetas. Por favor, obtenga antes un nmero de " +"fichero vlido de un listado de ficheros." #: gphoto2/foreach.c:283 #, c-format @@ -396,8 +397,8 @@ "Bad file number. You specified %i, but there is only 1 file available in '%" "s'." msgstr "" -"Nmero de archivo incorrecto. Usted especific %i, pero slo hay 1 archivo " -"disponible en '%s'" +"Nmero de fichero incorrecto. Ha indicado %i, pero slo hay disponible 1 " +"fichero en %s." #: gphoto2/foreach.c:291 #, c-format @@ -405,9 +406,9 @@ "Bad file number. You specified %i, but there are only %i files available in " "'%s'.Please obtain a valid file number from a file listing first." msgstr "" -"Nmero de archivo incorrecto. Usted especific %i, pero slo hay %i archivos " -"disponibles en '%s'. Por favor, primero obtenga un nmero de archivo vlido " -"de un listado de archivos." +"Nmero de fichero incorrecto. Ha indicado %i, pero slo hay %i ficheros " +"disponibles en %s. Por favor, obtenga antes un nmero de fichero vlido de " +"un listado de ficheros." #: gphoto2/gp-params.c:53 msgid "*** Error *** \n" @@ -415,11 +416,11 @@ #: gphoto2/gp-params.c:220 msgid "Press any key to continue.\n" -msgstr "Presione cualquier tecla para continuar.\n" +msgstr "Pulse cualquier tecla para continuar.\n" #: gphoto2/gp-params.c:237 msgid "Not enough memory." -msgstr "No hay memoria suficiente." +msgstr "No hay suficiente memoria." #: gphoto2/gphoto2-cmd-capture.c:201 msgid "Operation cancelled" @@ -449,6 +450,7 @@ msgid "Back" msgstr "Regresar" +# He comprobado que en otros idiomas lo traducen como hora. #: gphoto2/gphoto2-cmd-config.c:254 msgid "Time: " msgstr "Hora: " @@ -472,7 +474,7 @@ #: gphoto2/main.c:162 gphoto2/main.c:1488 msgid "Quiet output (default=verbose)" -msgstr "Salida silenciosa (por defecto=verbosa)" +msgstr "Salida silenciosa (por omisin=prolija)" #: gphoto2/main.c:166 gphoto2/main.c:1492 msgid "Display version and exit" @@ -492,11 +494,11 @@ #: gphoto2/main.c:170 gphoto2/main.c:1498 msgid "Send file to stdout" -msgstr "Enviar archivo a la salida estndar" +msgstr "Enviar fichero a la salida estndar" #: gphoto2/main.c:171 gphoto2/main.c:1500 msgid "Print filesize before data" -msgstr "Mostrar el tamao del archivo antes que los datos" +msgstr "Mostrar el tamao del fichero antes que los datos" #: gphoto2/main.c:172 gphoto2/main.c:1502 msgid "List auto-detected cameras" @@ -504,23 +506,23 @@ #: gphoto2/main.c:175 gphoto2/main.c:1504 msgid "Specify port device" -msgstr "Especificar el puerto del dispositivo" +msgstr "Indicar el puerto del dispositivo" #: gphoto2/main.c:176 gphoto2/main.c:1506 msgid "Specify serial transfer speed" -msgstr "Especificar la velocidad de transferencia serie" +msgstr "Indicar la velocidad de transferencia serie" #: gphoto2/main.c:177 gphoto2/main.c:1508 msgid "Specify camera model" -msgstr "Especificar el modelo de la cmara" +msgstr "Indicar el modelo de la cmara" #: gphoto2/main.c:178 gphoto2/main.c:1510 msgid "Specify a filename" -msgstr "Especificar un nombre de archivo" +msgstr "Indicar un nombre de fichero" #: gphoto2/main.c:179 gphoto2/main.c:1512 msgid "(expert only) Override USB IDs" -msgstr "(slo expertos) Ignorar los IDs de USB" +msgstr "(slo para expertos) Ignorar los IDs de USB" #: gphoto2/main.c:182 gphoto2/main.c:1514 msgid "Display camera abilities" @@ -528,23 +530,23 @@ #: gphoto2/main.c:183 gphoto2/main.c:1516 msgid "Specify camera folder (default=\"/\")" -msgstr "Especificar la carpeta (por defecto=\"/\")" +msgstr "Indicar la carpeta de cmara (predeterminada=\"/\")" #: gphoto2/main.c:184 gphoto2/main.c:1518 msgid "Recursion (default for download)" -msgstr "Recursin (por defecto para la descarga)" +msgstr "Recursin (predeterminado para la descarga)" #: gphoto2/main.c:185 gphoto2/main.c:1520 msgid "No recursion (default for deletion)" -msgstr "Sin recursin (por defecto para el borrado)" +msgstr "Sin recursin (predeterminado para el borrado)" #: gphoto2/main.c:186 gphoto2/main.c:1522 msgid "List folders in folder" -msgstr "Listar las carpetas en la carpeta" +msgstr "Listar las carpetas que hay en la carpeta" #: gphoto2/main.c:187 gphoto2/main.c:1524 msgid "List files in folder" -msgstr "Listar lso archivos en la carpeta" +msgstr "Listar los ficheros que hay en la carpeta" #: gphoto2/main.c:188 gphoto2/main.c:189 msgid "name" @@ -560,31 +562,31 @@ #: gphoto2/main.c:190 gphoto2/main.c:1530 msgid "Display number of files" -msgstr "Mostrar la cantidad de archivos" +msgstr "Mostrar el nmero de ficheros" #: gphoto2/main.c:191 gphoto2/main.c:1532 msgid "Get files given in range" -msgstr "Obtener los archivos del intervalo" +msgstr "Obtener los ficheros del intervalo" #: gphoto2/main.c:192 gphoto2/main.c:1534 msgid "Get all files from folder" -msgstr "Obtener todos los archivos de la carpeta" +msgstr "Obtener todos los ficheros de la carpeta" #: gphoto2/main.c:193 gphoto2/main.c:1536 msgid "Get thumbnails given in range" -msgstr "Ontener las diapositivas del intervalo" +msgstr "Obtener las miniaturas del intervalo" #: gphoto2/main.c:194 gphoto2/main.c:1539 msgid "Get all thumbnails from folder" -msgstr "Obtener todas las diapositivas de la carpeta" +msgstr "Obtener todas las miniaturas de la carpeta" #: gphoto2/main.c:195 gphoto2/main.c:1542 msgid "Get raw data given in range" -msgstr "Obtener los datos \"en crudo\" del intervalo" +msgstr "Obtener los datos en bruto del intervalo" #: gphoto2/main.c:196 gphoto2/main.c:1545 msgid "Get all raw data from folder" -msgstr "Obtener los datos \"en crudo\" de la carpeta" +msgstr "Obtener todos los datos en bruto de la carpeta" #: gphoto2/main.c:197 gphoto2/main.c:1548 msgid "Get audio data given in range" @@ -596,15 +598,15 @@ #: gphoto2/main.c:199 gphoto2/main.c:1553 msgid "Delete files given in range" -msgstr "Borrar los archivos del intervalo" +msgstr "Borrar los ficheros del intervalo" #: gphoto2/main.c:200 gphoto2/main.c:1555 msgid "Delete all files in folder" -msgstr "Borrar todos los archivos de la carpeta" +msgstr "Borrar todos los ficheros de la carpeta" #: gphoto2/main.c:201 gphoto2/main.c:1557 msgid "Upload a file to camera" -msgstr "Enviar un archivo a la cmara" +msgstr "Enviar un fichero a la cmara" #: gphoto2/main.c:203 gphoto2/main.c:1560 msgid "Configure" @@ -612,7 +614,7 @@ #: gphoto2/main.c:205 gphoto2/main.c:1564 msgid "Capture a quick preview" -msgstr "Capturar una pre-visualizacin" +msgstr "Capturar una previsualizacin rpida" #: gphoto2/main.c:206 gphoto2/main.c:1566 msgid "Capture an image" @@ -661,191 +663,190 @@ #: gphoto2/main.c:466 msgid "Jan" -msgstr "Ene" +msgstr "ene" #: gphoto2/main.c:466 msgid "January" -msgstr "Enero" +msgstr "enero" #: gphoto2/main.c:467 msgid "Feb" -msgstr "Feb" +msgstr "feb" #: gphoto2/main.c:467 msgid "February" -msgstr "Febrero" +msgstr "febrero" #: gphoto2/main.c:468 msgid "Mar" -msgstr "Mar" +msgstr "mar" #: gphoto2/main.c:468 msgid "March" -msgstr "Marzo" +msgstr "marzo" #: gphoto2/main.c:469 msgid "Apr" -msgstr "Abr" +msgstr "abr" #: gphoto2/main.c:469 msgid "April" -msgstr "Abril" +msgstr "abril" #: gphoto2/main.c:470 msgid "May" -msgstr "May" +msgstr "may" #: gphoto2/main.c:471 msgid "Jun" -msgstr "Jun" +msgstr "jun" #: gphoto2/main.c:471 msgid "June" -msgstr "Junio" +msgstr "junio" #: gphoto2/main.c:472 msgid "Jul" -msgstr "Jul" +msgstr "jul" #: gphoto2/main.c:472 msgid "July" -msgstr "Julio" +msgstr "julio" #: gphoto2/main.c:473 msgid "Aug" -msgstr "Ago" +msgstr "agt" #: gphoto2/main.c:473 msgid "August" -msgstr "Agosto" +msgstr "agosto" #: gphoto2/main.c:474 msgid "Sep" -msgstr "Sep" +msgstr "sep" #: gphoto2/main.c:474 msgid "September" -msgstr "Septiembre" +msgstr "septiembre" #: gphoto2/main.c:475 msgid "Oct" -msgstr "Oct" +msgstr "oct" #: gphoto2/main.c:475 msgid "October" -msgstr "Octubre" +msgstr "octubre" #: gphoto2/main.c:476 msgid "Nov" -msgstr "Nov" +msgstr "nov" #: gphoto2/main.c:476 msgid "November" -msgstr "Noviembre" +msgstr "noviembre" #: gphoto2/main.c:477 msgid "Dec" -msgstr "Dic" +msgstr "dic" #: gphoto2/main.c:477 msgid "December" -msgstr "Diciembre" +msgstr "diciembre" #: gphoto2/main.c:484 msgid "Sun" -msgstr "Dom" +msgstr "dom" #: gphoto2/main.c:484 msgid "Sunday" -msgstr "Domingo" +msgstr "domingo" #: gphoto2/main.c:485 msgid "Mon" -msgstr "Lun" +msgstr "lun" #: gphoto2/main.c:485 msgid "Monday" -msgstr "Lunes" +msgstr "lunes" #: gphoto2/main.c:486 msgid "Tue" -msgstr "Mar" +msgstr "mar" #: gphoto2/main.c:486 msgid "Tuesday" -msgstr "Martes" +msgstr "martes" #: gphoto2/main.c:487 msgid "Wed" -msgstr "Mi" +msgstr "mi" #: gphoto2/main.c:487 msgid "Wednesday" -msgstr "Mircoles" +msgstr "mircoles" #: gphoto2/main.c:488 msgid "Thu" -msgstr "Jue" +msgstr "jue" #: gphoto2/main.c:488 msgid "Thursday" -msgstr "Jueves" +msgstr "jueves" #: gphoto2/main.c:489 msgid "Fri" -msgstr "Vie" +msgstr "vie" #: gphoto2/main.c:489 msgid "Friday" -msgstr "Viernes" +msgstr "viernes" #: gphoto2/main.c:490 msgid "Sat" -msgstr "Sb" +msgstr "sb" #: gphoto2/main.c:490 msgid "Saturday" -msgstr "Sbado" +msgstr "sbado" #: gphoto2/main.c:552 #, c-format msgid "You cannot use '%n' in combination with non-persistent files!" -msgstr "No puede usar '%n' junto con archivos no persistentes!" +msgstr "No puede utilizar %n en combinacin con ficheros no persistentes." #: gphoto2/main.c:575 #, c-format msgid "The filename provided by the camera ('%s') does not contain a suffix!" -msgstr "" -"El nombre de archivo provisto por la cmara ('%s') no contiene un sufijo!" +msgstr "El nombre de fichero proporcionado por la cmara (%s) no tiene sufijo." #: gphoto2/main.c:654 #, c-format msgid "Invalid format '%s' (error at position %i)." -msgstr "Formato '%s' no vlido (error en posicin %i)" +msgstr "Formato %s no vlido (error en la posicin %i)." # !!! [y/n] !!! [CM] #: gphoto2/main.c:701 #, c-format msgid "File %s exists. Overwrite? [y|n] " -msgstr "El archivo %s existe. Sobreescribir? [y|n] " +msgstr "El fichero %s existe. Sobreescribir? [y|n] " #: gphoto2/main.c:712 msgid "Specify new filename? [y|n] " -msgstr "Especificar un nombre de archivo nuevo? [y|n] " +msgstr "Indicar un nuevo nombre de fichero? [y|n] " #: gphoto2/main.c:721 msgid "Enter new filename: " -msgstr "Ingrese el nombre de archivo nuevo: " +msgstr "Introduzca el nuevo nombre de fichero: " #: gphoto2/main.c:726 #, c-format msgid "Saving file as %s\n" -msgstr "Guardando archivo como %s\n" +msgstr "Guardando el fichero como %s\n" #: gphoto2/main.c:943 #, c-format msgid "New file is in location %s%s%s on the camera\n" -msgstr "El archivo nuevo est en la ubicacin %s%s%s en la cmara\n" +msgstr "El nuevo fichero est en la ubicacin %s%s%s en la cmara\n" #: gphoto2/main.c:1075 msgid "ERROR: " @@ -857,11 +858,11 @@ "Aborting...\n" msgstr "" "\n" -"Abandonando...\n" +"Interrumpiendo...\n" #: gphoto2/main.c:1104 msgid "Aborted.\n" -msgstr "Abandonado.\n" +msgstr "Interrumpido.\n" #: gphoto2/main.c:1109 msgid "" @@ -885,7 +886,7 @@ "*** Error (%i: '%s') *** \n" "\n" msgstr "" -"*** Error (%i: '%s') *** \n" +"*** Error (%i: %s) *** \n" "\n" #: gphoto2/main.c:1437 @@ -899,8 +900,8 @@ msgstr "" "Por favor, utilice la opcin --debug para obtener los mensajes de " "depuracin.\n" -"Estos mensajes pueden ayudar a encontrar la solucin a su problema.\n" -"Si intenta enviar cualquier mensaje de error o de depuracin a la lista\n" +"Estos mensajes pueden ayudar a encontrar una solucin a su problema.\n" +"Si piensa enviar cualquier mensaje de error o de depuracin a la lista\n" "de distribucin de desarrolladores de gPhoto ,\n" "por favor ejecute gphoto2 como sigue:\n" @@ -908,7 +909,7 @@ #: gphoto2/main.c:1490 msgid "Overwrite files without asking." -msgstr "Sobreescribir archivos sin preguntar." +msgstr "Sobreescribir los ficheros sin preguntar." #: gphoto2/main.c:1504 msgid "path" @@ -924,7 +925,7 @@ #: gphoto2/main.c:1510 msgid "filename" -msgstr "nombre de archivo" +msgstr "fichero" #: gphoto2/main.c:1512 msgid "usbid" @@ -940,15 +941,15 @@ #: gphoto2/main.c:1578 msgid "Show summary" -msgstr "Mostrar resumen" +msgstr "Mostrar un resumen" #: gphoto2/main.c:1580 msgid "Show camera driver manual" -msgstr "Mostrar manual del controlador de la cmara" +msgstr "Mostrar el manual del controlador de la cmara" #: gphoto2/main.c:1582 msgid "About the camera driver manual" -msgstr "Acerca del manual del controlador de la cmara" +msgstr "Acerca del manual controlador de la cmara" #: gphoto2/main.c:1809 msgid "" @@ -965,12 +966,12 @@ "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" msgstr "" "gPhoto2 para OS/2 necesita que configure la variable de entorno IOLIBS con " -"la ubicacin de las bibliotecas de comunicacin. Por ejemplo SET IOLIBS=C:" -"\\GPHOTO2\\IOLIB\n" +"la ubicacin de las bibliotecas de E/S. Por ejemplo SET IOLIBS=C:\\GPHOTO2" +"\\IOLIB\n" #: gphoto2/options.c:181 msgid "Usage:\n" -msgstr "Uso:\n" +msgstr "Sintaxis:\n" #: gphoto2/options.c:184 msgid "" @@ -1002,7 +1003,7 @@ "Image IDs must be a number greater than zero." msgstr "" "%s\n" -"Los ID de imagen deben ser un nmero superior a cero." +"Los ID de imagen deben ser un nmero mayor que cero." #: gphoto2/range.c:109 gphoto2/range.c:163 #, c-format @@ -1011,7 +1012,7 @@ "Image ID %i too high." msgstr "" "%s\n" -"ID de imagen %i muy grande." +"ID de imagen %i demasiado grande." #: gphoto2/range.c:125 #, c-format @@ -1020,7 +1021,7 @@ "Ranges must be separated by ','." msgstr "" "%s\n" -"Los intervalos deben estar separados por ','." +"Los intervalos deben estar separados por ,." #: gphoto2/range.c:139 #, c-format @@ -1038,7 +1039,7 @@ "Unexpected character '%c'." msgstr "" "%s\n" -"Caracter inesperado '%c'." +"Carcter inesperado %c." #: gphoto2/range.c:202 #, c-format @@ -1047,12 +1048,12 @@ "Decreasing ranges are not allowed. You specified a range from %i to %i." msgstr "" "%s\n" -"Los rangos decrecientes no estn permitidos. Especific un rango de %i a %i." +"No se permiten intervalos decrecientes. Ha indicado un intervalo de %i a %i." #: gphoto2/shell.c:55 #, c-format msgid "*** Error (%i: '%s') ***" -msgstr "*** Error (%i: '%s') ***" +msgstr "*** Error (%i: %s) ***" #: gphoto2/shell.c:98 msgid "Change to a directory on the camera" @@ -1072,20 +1073,20 @@ #: gphoto2/shell.c:103 msgid "Download a file" -msgstr "Descargar un archivo" +msgstr "Descargar un fichero" #: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 #: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 msgid "[directory/]filename" -msgstr "[directorio/]archivo" +msgstr "[directorio/]fichero" #: gphoto2/shell.c:105 msgid "Download a thumbnail" -msgstr "Descargar una diapositiva" +msgstr "Descargar una miniatura" #: gphoto2/shell.c:107 msgid "Download raw data" -msgstr "Descargar datos \"en crudo\"" +msgstr "Descargar datos en bruto" #: gphoto2/shell.c:111 msgid "Delete" @@ -1093,15 +1094,15 @@ #: gphoto2/shell.c:116 gphoto2/shell.c:122 msgid "Displays command usage" -msgstr "Mostrar el uso de los comandos" +msgstr "Muestra la sintaxis de los mandatos" #: gphoto2/shell.c:117 gphoto2/shell.c:122 msgid "[command]" -msgstr "[comando]" +msgstr "[mandato]" #: gphoto2/shell.c:118 msgid "List the contents of the current directory" -msgstr "Lista el contenido del directorio corriente" +msgstr "Lista el contenido del directorio actual" #: gphoto2/shell.c:119 msgid "[directory/]" @@ -1109,12 +1110,12 @@ #: gphoto2/shell.c:421 msgid "Invalid command." -msgstr "Comando no vlido." +msgstr "Mandato no vlido." #: gphoto2/shell.c:430 #, c-format msgid "The command '%s' requires an argument." -msgstr "El comando '%s' necesita un argumento." +msgstr "El mandato %s precisa de un argumento." #: gphoto2/shell.c:483 msgid "Invalid path." @@ -1122,29 +1123,29 @@ #: gphoto2/shell.c:529 msgid "Could not find home directory." -msgstr "No se puede encontrar la carpeta principal." +msgstr "No se puede encontrar el directorio inicial." #: gphoto2/shell.c:537 #, c-format msgid "Could not change to local directory '%s'." -msgstr "No se puede cambiar al directorio local '%s'." +msgstr "No se puede cambiar al directorio local %s." #: gphoto2/shell.c:540 #, c-format msgid "Local directory now '%s'." -msgstr "Ahora el directorio local es '%s'." +msgstr "El directorio local es ahora %s." #: gphoto2/shell.c:578 #, c-format msgid "Remote directory now '%s'." -msgstr "Ahora el directorio remoto es '%s'." +msgstr "El directorio remoto es ahora %s." #: gphoto2/shell.c:734 #, c-format msgid "Command '%s' not found. Use 'help' to get a list of available commands." msgstr "" -"No se encontr el comando '%s'. Utilice 'help' para obtener una lista de los " -"comandos disponibles." +"No se ha encontrado el mandato %s. Utilice help para obtener una lista " +"de los mandatos disponibles." #: gphoto2/shell.c:741 #, c-format @@ -1153,7 +1154,7 @@ #: gphoto2/shell.c:743 msgid "Usage:" -msgstr "Uso:" +msgstr "Sintaxis:" #: gphoto2/shell.c:747 msgid "Description:" @@ -1165,10 +1166,11 @@ #: gphoto2/shell.c:770 msgid "Available commands:" -msgstr "Comandos disponibles:" +msgstr "Mandatos disponibles:" #: gphoto2/shell.c:775 msgid "To get help on a particular command, type in 'help command-name'." msgstr "" -"Para obtener ayuda sobre un comando en particular, ingrese 'help nombre-del-" -"comando'." +"Para obtener ayuda sobre un mandato en particular, teclee help nombre-del-" +"mandato." + diff -Naur gphoto2-2.1.4/po/fi.po gphoto2/po/fi.po --- gphoto2-2.1.4/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/fi.po 2004-07-09 23:31:18.000000000 +0200 @@ -0,0 +1,1136 @@ +# Finnish translation for gphoto2. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the gphoto2 package. +# Matti Pll , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: gphoto2 2.1.2\n" +"POT-Creation-Date: 2003-08-10 20:58+0200\n" +"PO-Revision-Date: 2004-07-09 23:27+0200\n" +"Last-Translator: Matti Pll \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "Kansiossa \"%s\" olevien tiedostojen lukumr:%i\n" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "Kansio \"%s\" ei sisllkansioita." + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "Kansio \"%s\" sisltyhden kansion:" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "%i kansiota kansiossa \"%s\":" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "Kansio \"%s\" ei sislltiedostoja." + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "Kansio \"%s\" sisltyhden tiedoston:" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "%i tiedostoa kansiossa \"%s\":" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "Tiedoston \"%s\" tiedot (kansio \"%s\"):\n" + +#: gphoto2/actions.c:190 +msgid "File:\n" +msgstr "Tiedosto:\n" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +msgid " None available.\n" +msgstr " Ei saatavilla.\n" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr " Nimi: \"%s\"\n" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime-tyyppi: \"%s\"\n" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Koko: %li tavu(a)\n" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr " Leveys: %i pikseli()\n" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr " Korkeus: %i pikseli()\n" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Ladattu: %s\n" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "yes" +msgstr "kyll" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "no" +msgstr "ei" + +#: gphoto2/actions.c:208 +msgid " Permissions: " +msgstr " Oikeudet: " + +#: gphoto2/actions.c:211 +msgid "read/delete" +msgstr "luku/poistaminen" + +#: gphoto2/actions.c:213 +msgid "read" +msgstr "luku" + +#: gphoto2/actions.c:215 +msgid "delete" +msgstr "poistaminen" + +#: gphoto2/actions.c:217 +msgid "none" +msgstr "ei mitn" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr " Aika: %s" + +#: gphoto2/actions.c:224 +msgid "Thumbnail:\n" +msgstr "Pienoiskuva:\n" + +#: gphoto2/actions.c:240 +msgid "Audio data:\n" +msgstr "nidata:\n" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime-tyyppi: \"%s\"\n" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Koko: %li tavu(a)\n" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Ladattu: %s\n" + +#: gphoto2/actions.c:380 +msgid "Could not parse EXIF data." +msgstr "EXIF-tietojen jsentminen ei onnistunut." + +#: gphoto2/actions.c:384 +msgid "EXIF tags:" +msgstr "EXIF-merkit:" + +#: gphoto2/actions.c:387 +msgid "Tag" +msgstr "Merkki" + +#: gphoto2/actions.c:389 +msgid "Value" +msgstr "Arvo" + +#: gphoto2/actions.c:410 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "EXIF-data sisltpienoiskuvan (%i tavua)." + +#: gphoto2/actions.c:419 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "gphoto2 on knetty ilman EXIF-tukea." + +#: gphoto2/actions.c:437 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "Tuettujen kameroiden lukumr:%i\n" + +#: gphoto2/actions.c:439 +msgid "Supported cameras:\n" +msgstr "Tuetut kamerat:\n" + +#: gphoto2/actions.c:452 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "\t\"%s\" (TESTIKYTT)\n" + +#: gphoto2/actions.c:455 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "\t\"%s\" (KOKEELLINEN)\n" + +#: gphoto2/actions.c:460 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t\"%s\"\n" + +#: gphoto2/actions.c:488 +#, c-format +msgid "Devices found: %i\n" +msgstr "Lydettyjen laitteiden mr:%i\n" + +#: gphoto2/actions.c:489 +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" +"Polku Kuvaus\n" +"--------------------------------------------------------------\n" + +#: gphoto2/actions.c:528 gphoto2/actions.c:533 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:528 +msgid "Model" +msgstr "Malli" + +#: gphoto2/actions.c:528 +msgid "Port" +msgstr "Portti" + +#: gphoto2/actions.c:529 +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:546 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "Kameran valmiudet : %s\n" + +#: gphoto2/actions.c:547 +#, c-format +msgid "Serial port support : %s\n" +msgstr "Tuki sarjaportille : %s\n" + +#: gphoto2/actions.c:549 +#, c-format +msgid "USB support : %s\n" +msgstr "USB-tuki : %s\n" + +#: gphoto2/actions.c:552 +msgid "Transfer speeds supported :\n" +msgstr "Tuetut siirtonopeudet :\n" + +#: gphoto2/actions.c:554 +#, c-format +msgid " : %i\n" +msgstr " : %i\n" + +#: gphoto2/actions.c:557 +msgid "Capture choices :\n" +msgstr "Kaappausvaihtoehdot :\n" + +#: gphoto2/actions.c:559 +msgid " : Image\n" +msgstr " : Kuva\n" + +#: gphoto2/actions.c:561 +msgid " : Video\n" +msgstr " : Video\n" + +#: gphoto2/actions.c:563 +msgid " : Audio\n" +msgstr " : ani\n" + +#: gphoto2/actions.c:565 +msgid " : Preview\n" +msgstr " : Esikatselu\n" + +#: gphoto2/actions.c:566 +#, c-format +msgid "Configuration support : %s\n" +msgstr "Tuki asetusten muuttamiselle : %s\n" + +#: gphoto2/actions.c:568 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "Kuvien poistaminen kamerasta : %s\n" + +#: gphoto2/actions.c:571 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "Tuki tiedoston esikatselulle : %s\n" + +#: gphoto2/actions.c:574 +#, c-format +msgid "File upload support : %s\n" +msgstr "" +"Tuki tiedostojen lataamiselle \n" +"tietokoneelta kameraan : %s\n" + +#: gphoto2/actions.c:591 +#, c-format +msgid "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." +msgstr "" +"Portti ilmaistaan esimerkiksi \"serial:/dev/ttyS0\" tai \"usb\", mutta \n" +"merkkijonosta \"%s\" puuttuu kaksoispiste, joten oikea portti yritetn\n" +"lytautomaattisesti." + +#: gphoto2/actions.c:630 +#, c-format +msgid "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." +msgstr "" +"Mrittelemsi porttia (\"%s\") ei lydy. Mrittele jokin komennon\n" +"\"gphoto2 --list-ports\" listaamista porteista ja tarkista kirjoitusasu \n" +"(esim. etuliite \"serial:\" tai \"usb:\")" + +#: gphoto2/actions.c:668 +msgid "About the camera driver:" +msgstr "Tietoa kameran ajurista:" + +#: gphoto2/actions.c:682 +msgid "Camera summary:" +msgstr "Kameran kooste:" + +#: gphoto2/actions.c:696 +msgid "Camera manual:" +msgstr "Kameran kyttohje:" + +#: gphoto2/actions.c:712 +msgid "You can only specify speeds for serial ports." +msgstr "Nopeuden voi mrittvain sarjaporteille." + +#: gphoto2/actions.c:763 +#, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" +msgstr "" +"gphoto2 %s\n" +"\n" +"Tekijnoikeus 2000-2003 Lutz Mller ja muut\n" +"%s\n" +"\n" +"Tllohjelmalla EI lain sallimissa rajoissa OLE TAKUUTA.\n" +"Ohjelmaa saa levittGNU:n General Public Licensen mukaisesti;\n" +"katso listietoja tiedostosta COPYING.\n" +"\n" +"Tm gphoto2:n versio kyttseuraavia ohjelmistoversioita ja valitsimia:\n" + +#: gphoto2/actions.c:776 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "OS/2-siirros Bart van Leeuwen\n" + +#: gphoto2/actions.c:890 +msgid "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" +msgstr "" +"SISLLYTĠVIESTIISI AINA SEURAAVAT RIVIT LHETTESSSI VIANETSINT-\n" +"VIESTEJ POSTITUSLISTALLE:" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." +msgstr "" +"Virheellinen tiedoston numero. Annoit numeron %i, mutta vain %i tiedostoa\n" +"on saatavilla kansiossa \"%s\" ja sen alikansioissa. Selvitensin oikea\n" +"tiedoston numero tiedostolistauksesta." + +#: gphoto2/foreach.c:283 +#, c-format +msgid "Bad file number. You specified %i, but there is only 1 file available in '%s'." +msgstr "" +"Virheellinen tiedoston numero. Mritit numeron %i, mutta kansio \"%s\"\n" +"sisltvain yhden tiedoston." + +#: gphoto2/foreach.c:291 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." +msgstr "" +"Virheellinen tiedoston numero. Mritit numeron %i, mutta vain %i tiedostoa on\n" +"saatavilla kansiossa \"%s\". Selvitensin oikea tiedoston numero tiedostolistauksesta." + +#: gphoto2/gp-params.c:53 +msgid "*** Error *** \n" +msgstr "*** Virhe *** \n" + +#: gphoto2/gp-params.c:220 +msgid "Press any key to continue.\n" +msgstr "Paina jotakin nppintjatkaaksesi.\n" + +#: gphoto2/gp-params.c:237 +msgid "Not enough memory." +msgstr "Muistin mr ei riit." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Operaatio peruttu" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Jatka" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Peru" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Virhe" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Asetusten pivitys eponistui:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Lopeta" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Takaisin" + +#: gphoto2/gphoto2-cmd-config.c:253 +msgid "Time: " +msgstr "Aika: " + +#: gphoto2/gphoto2-cmd-config.c:312 gphoto2/gphoto2-cmd-config.c:340 +#: gphoto2/gphoto2-cmd-config.c:400 gphoto2/gphoto2-cmd-config.c:463 +msgid "Value: " +msgstr "Arvo: " + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "Yes" +msgstr "Kyll" + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "No" +msgstr "Ei" + +#: gphoto2/main.c:161 gphoto2/main.c:1461 +msgid "Turn on debugging" +msgstr "Aseta vianetsintplle" + +#: gphoto2/main.c:162 gphoto2/main.c:1463 +msgid "Quiet output (default=verbose)" +msgstr "Hiljainen tuloste (oletus=verbose)" + +#: gphoto2/main.c:166 gphoto2/main.c:1467 +msgid "Display version and exit" +msgstr "Nytversio ja lopeta" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Nytt tmn opasteruudun" + +#: gphoto2/main.c:168 gphoto2/main.c:1469 +msgid "List supported camera models" +msgstr "Listaa tuetut kameramallit" + +#: gphoto2/main.c:169 gphoto2/main.c:1471 +msgid "List supported port devices" +msgstr "Listaa tuetut portit" + +#: gphoto2/main.c:170 gphoto2/main.c:1473 +msgid "Send file to stdout" +msgstr "Lhettiedosto vakiotulosteeseen" + +#: gphoto2/main.c:171 gphoto2/main.c:1475 +msgid "Print filesize before data" +msgstr "Tulosta tiedoston koko ennen dataa" + +#: gphoto2/main.c:172 gphoto2/main.c:1477 +msgid "List auto-detected cameras" +msgstr "Listaa automaattisesti tunnistetut kamerat" + +#: gphoto2/main.c:175 gphoto2/main.c:1479 +msgid "Specify port device" +msgstr "Mritportti" + +#: gphoto2/main.c:176 gphoto2/main.c:1481 +msgid "Specify serial transfer speed" +msgstr "Mritsarjaportin siirtonopeus" + +#: gphoto2/main.c:177 gphoto2/main.c:1483 +msgid "Specify camera model" +msgstr "Mritkameran malli" + +#: gphoto2/main.c:178 gphoto2/main.c:1485 +msgid "Specify a filename" +msgstr "Mrittiedoston nimi" + +#: gphoto2/main.c:179 gphoto2/main.c:1487 +msgid "(expert only) Override USB IDs" +msgstr "(vain asiantuntijoille) Kumoa USB-tunnisteet" + +#: gphoto2/main.c:182 gphoto2/main.c:1489 +msgid "Display camera abilities" +msgstr "Nytkameran valmiudet" + +#: gphoto2/main.c:183 gphoto2/main.c:1491 +msgid "Specify camera folder (default=\"/\")" +msgstr "Mritkameran kansio (oletus=\"/\")" + +#: gphoto2/main.c:184 gphoto2/main.c:1493 +msgid "Recursion (default for download)" +msgstr "Rekursio (oletus tiedostojen kamerasta lataamiselle)" + +#: gphoto2/main.c:185 gphoto2/main.c:1495 +msgid "No recursion (default for deletion)" +msgstr "Ei rekursiota (oletus poistolle)" + +#: gphoto2/main.c:186 gphoto2/main.c:1497 +msgid "List folders in folder" +msgstr "Listaa kansion sisltmt kansiot" + +#: gphoto2/main.c:187 gphoto2/main.c:1499 +msgid "List files in folder" +msgstr "Listaa kansion sisltmt tiedostot" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "nimi" + +#: gphoto2/main.c:188 gphoto2/main.c:1501 +msgid "Create a directory" +msgstr "Luo kansio" + +#: gphoto2/main.c:189 gphoto2/main.c:1503 +msgid "Remove a directory" +msgstr "Poista kansio" + +#: gphoto2/main.c:190 gphoto2/main.c:1505 +msgid "Display number of files" +msgstr "Nyttiedostojen lukumr" + +#: gphoto2/main.c:191 gphoto2/main.c:1507 +msgid "Get files given in range" +msgstr "Hae tiedostot mritellyltlukualueelta" + +#: gphoto2/main.c:192 gphoto2/main.c:1509 +msgid "Get all files from folder" +msgstr "Hae kaikki tiedostot kansiosta" + +#: gphoto2/main.c:193 gphoto2/main.c:1511 +msgid "Get thumbnails given in range" +msgstr "Hae pienoiskuvat mritellyltlukualueelta" + +#: gphoto2/main.c:194 gphoto2/main.c:1514 +msgid "Get all thumbnails from folder" +msgstr "Hae kaikki pienoiskuvat kansiosta" + +#: gphoto2/main.c:195 gphoto2/main.c:1517 +msgid "Get raw data given in range" +msgstr "Hae raakadata mritellyltlukualueelta" + +#: gphoto2/main.c:196 gphoto2/main.c:1520 +msgid "Get all raw data from folder" +msgstr "Hae kaikki raakadata kansiosta" + +#: gphoto2/main.c:197 gphoto2/main.c:1523 +msgid "Get audio data given in range" +msgstr "Hae nidata mritellyltlukualueelta" + +#: gphoto2/main.c:198 gphoto2/main.c:1526 +msgid "Get all audio data from folder" +msgstr "Hae kaikki nidata kansiosta" + +#: gphoto2/main.c:199 gphoto2/main.c:1528 +msgid "Delete files given in range" +msgstr "Poista tiedostot mritellyltlukualueelta" + +#: gphoto2/main.c:200 gphoto2/main.c:1530 +msgid "Delete all files in folder" +msgstr "Poista kaikki tiedostot kansiosta" + +#: gphoto2/main.c:201 gphoto2/main.c:1532 +msgid "Upload a file to camera" +msgstr "Lataa tiedosto kameraan" + +#: gphoto2/main.c:203 gphoto2/main.c:1535 +msgid "Configure" +msgstr "Aseta" + +#: gphoto2/main.c:205 gphoto2/main.c:1539 +msgid "Capture a quick preview" +msgstr "Kaappaa nopea esikatselukuva" + +#: gphoto2/main.c:206 gphoto2/main.c:1541 +msgid "Capture an image" +msgstr "Kaappaa kuva" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Kaappaa elokuva " + +#: gphoto2/main.c:208 gphoto2/main.c:1545 +msgid "Capture an audio clip" +msgstr "Kaappaa niptk" + +#: gphoto2/main.c:210 gphoto2/main.c:1548 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "NytEXIF-tiedot" + +#: gphoto2/main.c:212 gphoto2/main.c:1551 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Nyt tiedot" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "Kooste kameran tilasta" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "Kameran ajurin kyttohje" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "Tietoa kameran ajurista" + +#: gphoto2/main.c:216 gphoto2/main.c:1559 +msgid "gPhoto shell" +msgstr "gPhoto-komentotulkki" + +#: gphoto2/main.c:343 gphoto2/main.c:1192 +msgid "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "" +"Kytmerkinttapaa a:b=c:d ksitellesssi a:b:ntunnistettua \n" +"USB-laitetta c:d:n.a, b, c ja d tulee olla \"0x\":llalkavia \n" +"heksadesimaalilukuja.\n" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "tam" + +#: gphoto2/main.c:466 +msgid "January" +msgstr "tammikuuta" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "hel" + +#: gphoto2/main.c:467 +msgid "February" +msgstr "helmikuuta" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "maa" + +#: gphoto2/main.c:468 +msgid "March" +msgstr "maaliskuuta" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "huh" + +#: gphoto2/main.c:469 +msgid "April" +msgstr "huhtikuuta" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "tou" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "kes" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "keskuuta" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "hei" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "heinkuuta" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "elo" + +#: gphoto2/main.c:473 +msgid "August" +msgstr "elokuuta" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "syy" + +#: gphoto2/main.c:474 +msgid "September" +msgstr "syyskuuta" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "lok" + +#: gphoto2/main.c:475 +msgid "October" +msgstr "lokakuuta" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "mar" + +#: gphoto2/main.c:476 +msgid "November" +msgstr "marraskuuta" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "jou" + +#: gphoto2/main.c:477 +msgid "December" +msgstr "joulukuuta" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "su" + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "sunnuntai" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "ma" + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "maanantai" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "ti" + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "tiistai" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "ke" + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "keskiviikko" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "to" + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "torstai" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "pe" + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "perjantai" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "la" + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "lauantai" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "Et voi kyttkohdetta \"%n\" vliaikaistiedostojen yhteydess!" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "Kameran antama tiedoston nimi (\"%s\") ei sisllptett!" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "Virheellinen muoto \"%s\" (virhe kohdassa %i)." + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "Tiedosto %s on olemassa. Ylikirjoitetaanko? [y|n] " + +#: gphoto2/main.c:712 +msgid "Specify new filename? [y|n] " +msgstr "Anna uusi tiedostonimi? [y|n] " + +#: gphoto2/main.c:721 +msgid "Enter new filename: " +msgstr "Sytuusi tiedostonimi: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Tallennetaan tiedosto nimell%s\n" + +#: gphoto2/main.c:918 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "Uusi tiedosto sijaitsee kamerassa paikassa %s%s%s\n" + +#: gphoto2/main.c:1050 +msgid "ERROR: " +msgstr "VIRHE: " + +#: gphoto2/main.c:1073 +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Keskeytetn...\n" + +#: gphoto2/main.c:1079 +msgid "Aborted.\n" +msgstr "Keskeytetty.\n" + +#: gphoto2/main.c:1084 +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Perutaan...\n" + +#: gphoto2/main.c:1291 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "gphoto2 on knetty ilman tukea CDK:lle." + +#: gphoto2/main.c:1404 +msgid "Operation cancelled.\n" +msgstr "Toimenpide keskeytetty.\n" + +#: gphoto2/main.c:1408 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Virhe (%i: \"%s\") *** \n" +"\n" + +#: gphoto2/main.c:1412 +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" +"Nhdksesi vianetsintviestit, kyt䠭-debug-valitsinta. \n" +"Vianetsintviestit voivat auttaa lytmn ratkaisun ongelmaasi. \n" +"Jos aiot lhettvirhe- tai vianetsintviestejgphoto:n\n" +"kehittjien shkpostilistalle ,\n" +"ole hyvja kynnistgphoto2 seuraavasti:\n" +"\n" + +#: gphoto2/main.c:1465 +msgid "Overwrite files without asking." +msgstr "Ylikirjoita tiedostot kysymtt." + +#: gphoto2/main.c:1479 +msgid "path" +msgstr "polku" + +#: gphoto2/main.c:1481 +msgid "speed" +msgstr "nopeus" + +#: gphoto2/main.c:1483 +msgid "model" +msgstr "malli" + +#: gphoto2/main.c:1485 +msgid "filename" +msgstr "tiedostonimi" + +#: gphoto2/main.c:1487 +msgid "usbid" +msgstr "usbid" + +#: gphoto2/main.c:1491 +msgid "folder" +msgstr "kansio" + +#: gphoto2/main.c:1543 +msgid "Capture a movie" +msgstr "Kaappaa elokuva" + +#: gphoto2/main.c:1553 +msgid "Show summary" +msgstr "Nytkooste" + +#: gphoto2/main.c:1555 +msgid "Show camera driver manual" +msgstr "Nytkameran ajurin kyttohje" + +#: gphoto2/main.c:1557 +msgid "About the camera driver manual" +msgstr "Tietoa kameran ajurin kyttohjeesta" + +#: gphoto2/main.c:1784 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "" +"gPhoto2 OS/2:lle vaatii \"CAMLIBS\"-ympristmuuttujan asettamisen \n" +"kamerakirjastoihin sopivaksi. Esim. SET CAMLIBS=C:\\\\GPHOTO2\\\\CAM\n" + +#: gphoto2/main.c:1794 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "" +"gPhoto2 OS/2:lle vaatii \"IOLIBS\"-ympristmuuttujan asettamisen \n" +"io-kirjastoihin sopivaksi. Esim. SET IOLIBS=C:\\\\GPHOTO2\\\\IOLIB\n" + +#: gphoto2/options.c:181 +msgid "Usage:\n" +msgstr "Kytt:\n" + +#: gphoto2/options.c:184 +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" +"Lyhyet/pitktvalinnat (ja argumentit) Kuvaus\n" +"--------------------------------------------------------------------------------\n" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" +msgstr "" +"--------------------------------------------------------------------------------\n" +"[Kytkaksoislainausmerkkejargumenttien ymprill [Kuvan numero alkaa\n" +"ykksell(1)]\n" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" +"%s\n" +"Kuvan numeron tulee olla nollaa suurempi." + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" +"%s\n" +"Kuvan numero %i on liian suuri." + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" +"%s\n" +"Lukualueet tulee erottaa pilkuilla \",\"." + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" +"%s\n" +"Lukualueiden tulee alkaa numerolla." + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" +"%s\n" +"Odottamaton merkki \"%c\"." + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" +"%s\n" +"Vhenevtlukualueet eivtole sallittuja. Mritit alueen luvusta %i \n" +"lukuun %i." + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Virhe (%i: \"%s\") ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Siirry kameran kansioon" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "kansio" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Siirry paikallisen aseman kansioon" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "Poistu gPhoto-komentotulkista" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Lataa tiedosto" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[kansio/]tiedostonimi" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Lataa pienoiskuva" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Lataa raakadata" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Poista" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Nytkomennon kyttohjeet" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[komento]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "Listaa nykyisen kansion sislt" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[kansio/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "Virheellinen komento." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "Komento \"%s\" vaatii argumentin." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "Virheellinen polku." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "Kotikansiota ei lytynyt." + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "Paikalliseen kansioon \"%s\" siirtyminen ei onnistunut." + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "Paikallinen kansio on nyt \"%s\"." + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "Etkansio on nyt \"%s\"." + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "" +"Komentoa \"%s\" ei lydy. Kytkomentoa \"help\" nhdksesi listan kytss olevista\n" +"komennoista." + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "Ohjeita aiheesta \"%s\":" + +#: gphoto2/shell.c:743 +msgid "Usage:" +msgstr "Kytt:" + +#: gphoto2/shell.c:747 +msgid "Description:" +msgstr "Kuvaus:" + +#: gphoto2/shell.c:749 +msgid "* Arguments in brackets [] are optional" +msgstr "* Argumentit hakasuluissa [] ovat valinnaisia" + +#: gphoto2/shell.c:770 +msgid "Available commands:" +msgstr "Kytss olevat komennot:" + +#: gphoto2/shell.c:775 +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "Saadaksesi apua tietyn komennon kytst kirjoita \"help komennon-nimi\"." diff -Naur gphoto2-2.1.4/po/fr.gmo gphoto2/po/fr.gmo --- gphoto2-2.1.4/po/fr.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/fr.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -K 89@V gu&)G)+H)t0@\w  J0 #Q&u'!<;Y8 H USb& 7; ANRYmrN$4E]s##(G&= d)n1&M t4F*N -y!&& - 1 8 M!Q!X!w!!!!!" " >"(L"u"+" """""""""#%#B#*^########-####$*$.$#7$ [$|$$$$$$l$^%uc%%%& /&P&k&~&&&&& &&&&l'' ' ''#'''(0(N(g(k(r((&(E((")$)")$ *!E*#g** ***A*#*+++&/+V+n+u+}+,, , $,.,-2,=`, , ,,, ,,, ,,-o ./|/2/////// /000H0a1h1 ~1 113161P26e2A2623(3:3V3k33333334 "4 /4e94 464443,5`5%}5155!56;/6k6 7 7 (7j6737 7 7 8"#8F8J8P8`8d8i888X9g:::::::;*;0=;)n;);[;3< -R</]<)<'<)< === -'=$2=$W=3|= ==%==><>L>f>>> >6>># ?/?6?G?K?(S?3|?3? -?S?CAGA&PA!wA(AA+A&B--B'[BB.BB.BCC C(C,C4C8C"=C#`C#C(C#C'C(DFDJDODSDZD^D=dDD-DDDD,D3$E"XE{EEEE"ElE=FBF,F(G#-G-QG*GGGG"G G H H3H~NHHH -I#I5I!QIsI,I!I'I J(J,J5JLJ(SJA|JJ+K)K%K0L*JL(uLL LLLWL0MGMKMQM3eMMMMM}N NNNN;NSN -/O :OHO -dO -oOzO -OOOQP}P(xR,RRRRRRRRSSSi(]*1FJs_bxu{"2Wj+\;=|~:4qzl P6YM$ Ao?QBwU R,)-K^ntr -pGH@%&dhvE>3yeOC8XZVm} #D`7!a9NS.<Tc0I/'kgf5 "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Capture not supported by the driver - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2002-06-18 16:30--500 -Last-Translator: christophe barb -Language-Team: Franais -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit - "%s" - "%s" (EXPRIMENTAL) - "%s" (TEST) - -Abandon... - -Annulation... - : %i - : Audio - : La capture n'est pas supporte par ce pilote - : Image - : Prvisualisation - : Vido - Tlcharg : %s - Tlcharg: %s - Hauteur : %i pixel(s) - Type MIME : '%s' - Type MIME : '%s' - Nom : '%s' - Aucune disponible. - Permissions: Taille : %li octet(s) - Taille : %li octets(s) - Heure : %s Largeur : %i pixel(s) -%-30s %-16s -%-32s %s -%s -Les intervalles dcroissants ne sont pas autoriss. Vous devez spcifier un intervalle de %i %i.%s -Numro d'image %i trop grand.%s -Les numros d'image doivent tre suprieurs zro.%s -Les intervalles doivent tre spars par des ','.%s -Les intervalles doivent commencer par un nombre.%s -Caractre inattendu '%c'.(expert seulement) Imposer les ID USB* Les arguments entre crochets [] sont optionnels*** Erreur (%i: '%s') ****** Erreur (%i: '%s') *** - -*** Erreur *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Utiliser " pour les arg.] [Les numros d'images commencent un (1)] -ContinuerAnnulerErreurTOUJOURS FOURNIR LES LIGNES CI-DESSOUS LORS DE L'ENVOI DE MESSAGE(S) DE DBOGAGE LA LISTE DE DIFFUSION :Capacits de l'appareil : %s -Abandonn. - propos du pilote de l'appareil propos du pilote de l'appareil propos du pilote de l'appareil :AvrAvrilDonnes audio: -AoAotCommandes disponibles :RetourMauvais numro de fichier. Vous avez spcifi %i, Mais il y a seulement %i fichiers disponibles dans '%s' et ses sous-rpertoires. Vous pouvez obtenir un numro de fichier correct dans la liste des fichiers.Mauvais numro de fichier. Vous avez spcifi %i, mais il y a seulement %i fichiers disponibles dnas '%s'. Vous pouvez obtenir un numro de fichier correct dans la liste des fichiers disponibles.Mauvais numro de fichier. Vous avez spcifi %i, mais il y a seulement 1 fichier disponible dans '%s'.Manuel du pilote de l'appareilManuel de l'appareil :Rsum de l'appareil :Capturer un film Capturer un film Capturer une prvisualisationCapturer un clip audioCapturer une imageChoix de capture : -Changer vers un rpertoire sur l'appareilChanger le rpertoire sur le disque localCommande '%s' non trouve. Utilisez 'help' pour obtenir la liste des commandes disponibles.Support de la configuration : %s -ConfigurerImpossible de trouver le rpertoire local '%s'.Impossible de trouver le rpertoire home.Impossible d'analyser les donnes EXIF.Impossible d'appliquer la configuration :Crer un dossierDcDcembreEffacementEffacer tous les fichiers du dossierEffacer les fichiers de l'intervalleEffacer les fichiers du support de l'appareil : %s -Description:Dispositifs trouvs : %i -Spcifier les capacits de l'appareilAfficher le nombre de fichiersAfficher la version et terminerAfficher l'aideAfficher cet cran d'aideTlchargement d'un fichierTlchargement de la vignetteTlchargement des donnesERREUR : Les donnes EXIF contiennent une vignette (%i octets).Balises EXIF :Entrez le nouveau nom de fichier : SortirQuitter le shellFvFvrierLe fichier %s existe. L'craser ? [y|n] Support des vignettes : %s -Support de l'envoi de fichiers : %s -Fichier : -Pour obtenir les messages de dbogage, merci d'utiliser l'option --debug. -Ces messages peuvent aider trouver une solution votre problme. -Si vous avez l'intention d'envoyer un message d'erreur ou de dbogage la -liste de distribution des dveloppeurs gPhoto , -merci de lancer gphoto2 comme suit : - -VenVendrediRcuprer les donnes audio du dossierRcuprer les fichiers du dossierRcuprer les fichiers brutes du dossierRcuprer les vignettesRcuperer les donnes audio de l'intervalleRcuprer les fichiers de l'intervalleRcuprer les fichiers brutes de l'intervalleRcuprer les vignettes de l'intervalleAide sur "%s":Informations du fichier '%s' (dossier '%s') : -Commande invalide.Format invalide '%s' (erreur la position %i)Chemin d'accs invalide.JanJanvierJulJuilletJuiJuinLister les appareils auto-dtectsLister les fichiers dans le dossierLister les dossiers dans le dossierLister les modles d'appareils supportsLister les types de ports supportsLister le contenu du rpertoire courantLe rpertoire local est maintenant '%s'.MarMarsMaiModleLunLundiLe nouveau fichier est l'emplacement %s%s%s sur l'appareil -NonPas de rcursion (par dfaut pour effacement)Pas assez de mmoire.NovNovembreNombre de fichiers dans le dossier '%s': %i -Nombre d'appareils supports : %i -Portage OS/2 par Bart van Leeuwen -OctOctobreOpration annuleOpration annule. -Rcrit les fichiers sans demanderChemin Description --------------------------------------------------------------- -PortLes ports doivent ressembler serial:/dev/ttyS0 ou usb:, mais il manque un : '%s'; je vais donc essayer de deviner ce que vous voulez dire.Veuillez presser une touche pour continuer. -Indiquer taille de fichier avant donnesSortie silencieuse (defaut=verbeux)Rcursion (par dfaut pour le tlchargement)Le rpertoire distant est maintenant '%s'.Effacer un dossierSamSamediEnregistrement du fichier sous %s -Rsultats sur la sortie standardSepSeptembreSupport du port srie : %s -Option courtes/longues (& arg.) Description --------------------------------------------------------------------------------- -Montrer les informations EXIFManuel du pilote de l'appareilMontrer les informationsAffiche un rsumSpcifier un nom de fichierSpcifier le dossier (dfaut="/")Spcifier le modle d'appareilSpcifier un nouveau nom de fichier ? [y|n] Spcifier le port de priphriqueSpcifier la vitesse du transfert srieRsum de l'tat de l'appareilDimDimancheAppareils supports : -BaliseLa commande '%s' a besoin d'un argument.Le fichier donn par l'appareil photo ('%s') n'a pas de suffixe !Le port que vous avez spcifi ('%s') est introuvable. Merci de spcifier l'un des ports trouv par la commande gphoto2 --list-ports et assurez-vous que la syntaxe est correcte (i.e. avec le prfixe 'serial:' or 'usb:'.)Il existe %i fichiers dans le dossier '%s'.Il y a %i dossiers dans le dossier '%s' :Pas de fichiers dans le dossier '%s'.Il n'y a pas de dossier(s) dans le dossier '%s'.Il existe un fichier dans le dossier '%s':Il y a un dossier dans le dossier '%s' :JeuVignette : -JeudiHeure : Pour obtenir de l'aide sur une commande particulire, tapez 'help nom-de-la-commande'. Vitesses de transfert supportes : -MarMardiActiver le dbogageSupport du port USB : %s -Envoyer un fichier l'appareilUsage :Usage : -Utilisez la syntaxe a:b=c:d pour traiter n'importe quel priphrique USB dtect comme a:b en tant que c:d. a b c et d doivent tre des nombres hexadecimaux commenant par '0x'. -ValeurValeur : MerMercrediOuiLa vitesse ne peut tre spcifie que pour les ports srie.Vous ne pouvez pas utiliser '%n' en combinaison avec les fichiers non-persistants ![commande][rpertoire/][rpertoire/]nom-de-fichiereffacementrpertoirefichierrpertoireInterprteur gPhotogPhoto2 pour OS/2 requiert que vous positionnez la variable d'environnement CAMLIBS l'emplacement des bibliothques de support des appareils, ie. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 pour OS/2 requiert que vous positionnez la variable d'environnement IOLIBS l'emplacement des bibliothques de communication, ie. SET CAMLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller et autres -%s -gphoto2 est livr SANS GARANTIES, tel que dfini par la loi. Vous pouvez -redistribuer des copies de gphoto2 sous les termes de la licence publique -gnrale GNU. Pour plus d'informations sur ces propos, voyez les fichiers nomms COPYING. - -Cette version de gphoto2 utilise les versions et options des logiciels suivants: -gphoto2 a t compil sans support EXIF.gphoto2 a t compil sans support pour CDK.Modlenomnonaucunecheminlecturelecture/effacementvitesseusbidoui \ No newline at end of file diff -Naur gphoto2-2.1.4/po/fr.po gphoto2/po/fr.po --- gphoto2-2.1.4/po/fr.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/fr.po 2004-03-22 01:01:43.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gphoto2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2002-06-18 16:30--500\n" "Last-Translator: christophe barb \n" "Language-Team: Franais \n" @@ -54,10 +54,12 @@ msgstr "Informations du fichier '%s' (dossier '%s') :\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Fichier :\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " Aucune disponible.\n" @@ -104,22 +106,27 @@ msgstr "non" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Permissions: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "lecture/effacement" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "lecture" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "effacement" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "aucune" @@ -129,10 +136,12 @@ msgstr " Heure : %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Vignette : \n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Donnes audio:\n" @@ -156,6 +165,7 @@ msgstr "Impossible d'analyser les donnes EXIF." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "Balises EXIF :" @@ -182,6 +192,7 @@ msgstr "Nombre d'appareils supports : %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Appareils supports :\n" @@ -206,6 +217,7 @@ msgstr "Dispositifs trouvs : %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -227,6 +239,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -246,6 +259,7 @@ msgstr "Support du port USB : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Vitesses de transfert supportes :\n" @@ -255,26 +269,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Choix de capture :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Image\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Vido\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Audio\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Prvisualisation\n" #: gphoto2/actions.c:588 +#, c-format msgid "" " : Capture not supported by the driver\n" msgstr "" @@ -322,18 +342,22 @@ "que la syntaxe est correcte (i.e. avec le prfixe 'serial:' or 'usb:'.)" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr " propos du pilote de l'appareil :" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Rsum de l'appareil :" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Manuel de l'appareil :" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "La vitesse ne peut tre spcifie que pour les ports srie." @@ -342,7 +366,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -354,7 +378,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller et autres\n" +"Copyright (c) 2000-2004 Lutz Mueller et autres\n" "%s\n" "gphoto2 est livr SANS GARANTIES, tel que dfini par la loi. Vous pouvez\n" "redistribuer des copies de gphoto2 sous les termes de la licence publique\n" @@ -407,14 +431,17 @@ "correct dans la liste des fichiers disponibles." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Erreur *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Veuillez presser une touche pour continuer.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Pas assez de mmoire." @@ -648,6 +675,7 @@ msgstr "Interprteur gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -828,10 +856,12 @@ msgstr "Le fichier %s existe. L'craser ? [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Spcifier un nouveau nom de fichier ? [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Entrez le nouveau nom de fichier : " @@ -846,10 +876,12 @@ msgstr "Le nouveau fichier est l'emplacement %s%s%s sur l'appareil\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "ERREUR : " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -858,10 +890,12 @@ "Abandon...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Abandonn.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -874,6 +908,7 @@ msgstr "gphoto2 a t compil sans support pour CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Opration annule.\n" @@ -887,6 +922,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -948,6 +984,7 @@ msgstr " propos du pilote de l'appareil" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -957,6 +994,7 @@ "CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -966,10 +1004,12 @@ "\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Usage :\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -983,6 +1023,7 @@ msgstr "%-32s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1150,22 +1191,27 @@ msgstr "Aide sur \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Usage :" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Description:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Les arguments entre crochets [] sont optionnels" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Commandes disponibles :" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Pour obtenir de l'aide sur une commande particulire, tapez 'help nom-de-la-" diff -Naur gphoto2-2.1.4/po/gphoto2.pot gphoto2/po/gphoto2.pot --- gphoto2-2.1.4/po/gphoto2.pot 2004-01-18 21:01:44.000000000 +0100 +++ gphoto2/po/gphoto2.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,1098 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: gphoto2/actions.c:101 -#, c-format -msgid "Number of files in folder '%s': %i\n" -msgstr "" - -#: gphoto2/actions.c:122 -#, c-format -msgid "There are no folders in folder '%s'." -msgstr "" - -#: gphoto2/actions.c:126 -#, c-format -msgid "There is one folder in folder '%s':" -msgstr "" - -#: gphoto2/actions.c:130 -#, c-format -msgid "There are %i folders in folder '%s':" -msgstr "" - -#: gphoto2/actions.c:157 gphoto2/foreach.c:277 -#, c-format -msgid "There are no files in folder '%s'." -msgstr "" - -#: gphoto2/actions.c:162 -#, c-format -msgid "There is one file in folder '%s':" -msgstr "" - -#: gphoto2/actions.c:167 -#, c-format -msgid "There are %i files in folder '%s':" -msgstr "" - -#: gphoto2/actions.c:188 -#, c-format -msgid "Information on file '%s' (folder '%s'):\n" -msgstr "" - -#: gphoto2/actions.c:190 -msgid "File:\n" -msgstr "" - -#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -msgid " None available.\n" -msgstr "" - -#: gphoto2/actions.c:195 -#, c-format -msgid " Name: '%s'\n" -msgstr "" - -#: gphoto2/actions.c:197 gphoto2/actions.c:229 -#, c-format -msgid " Mime type: '%s'\n" -msgstr "" - -#: gphoto2/actions.c:199 gphoto2/actions.c:231 -#, c-format -msgid " Size: %li byte(s)\n" -msgstr "" - -#: gphoto2/actions.c:201 gphoto2/actions.c:233 -#, c-format -msgid " Width: %i pixel(s)\n" -msgstr "" - -#: gphoto2/actions.c:203 gphoto2/actions.c:235 -#, c-format -msgid " Height: %i pixel(s)\n" -msgstr "" - -#: gphoto2/actions.c:205 gphoto2/actions.c:237 -#, c-format -msgid " Downloaded: %s\n" -msgstr "" - -#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 -#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 -#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 -msgid "yes" -msgstr "" - -#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 -#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 -#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 -msgid "no" -msgstr "" - -#: gphoto2/actions.c:208 -msgid " Permissions: " -msgstr "" - -#: gphoto2/actions.c:211 -msgid "read/delete" -msgstr "" - -#: gphoto2/actions.c:213 -msgid "read" -msgstr "" - -#: gphoto2/actions.c:215 -msgid "delete" -msgstr "" - -#: gphoto2/actions.c:217 -msgid "none" -msgstr "" - -#: gphoto2/actions.c:221 -#, c-format -msgid " Time: %s" -msgstr "" - -#: gphoto2/actions.c:224 -msgid "Thumbnail:\n" -msgstr "" - -#: gphoto2/actions.c:240 -msgid "Audio data:\n" -msgstr "" - -#: gphoto2/actions.c:245 -#, c-format -msgid " Mime type: '%s'\n" -msgstr "" - -#: gphoto2/actions.c:247 -#, c-format -msgid " Size: %li byte(s)\n" -msgstr "" - -#: gphoto2/actions.c:249 -#, c-format -msgid " Downloaded: %s\n" -msgstr "" - -#: gphoto2/actions.c:392 -msgid "Could not parse EXIF data." -msgstr "" - -#: gphoto2/actions.c:396 -msgid "EXIF tags:" -msgstr "" - -#: gphoto2/actions.c:399 -msgid "Tag" -msgstr "" - -#: gphoto2/actions.c:401 -msgid "Value" -msgstr "" - -#: gphoto2/actions.c:422 -#, c-format -msgid "EXIF data contains a thumbnail (%i bytes)." -msgstr "" - -#: gphoto2/actions.c:431 -msgid "gphoto2 has been compiled without EXIF support." -msgstr "" - -#: gphoto2/actions.c:449 -#, c-format -msgid "Number of supported cameras: %i\n" -msgstr "" - -#: gphoto2/actions.c:451 -msgid "Supported cameras:\n" -msgstr "" - -#: gphoto2/actions.c:464 -#, c-format -msgid "\t\"%s\" (TESTING)\n" -msgstr "" - -#: gphoto2/actions.c:467 -#, c-format -msgid "\t\"%s\" (EXPERIMENTAL)\n" -msgstr "" - -#: gphoto2/actions.c:472 -#, c-format -msgid "\t\"%s\"\n" -msgstr "" - -#: gphoto2/actions.c:500 -#, c-format -msgid "Devices found: %i\n" -msgstr "" - -#: gphoto2/actions.c:501 -msgid "" -"Path Description\n" -"--------------------------------------------------------------\n" -msgstr "" - -#: gphoto2/actions.c:540 gphoto2/actions.c:545 -#, c-format -msgid "%-30s %-16s\n" -msgstr "" - -#: gphoto2/actions.c:540 -msgid "Model" -msgstr "" - -#: gphoto2/actions.c:540 -msgid "Port" -msgstr "" - -#: gphoto2/actions.c:541 -msgid "----------------------------------------------------------\n" -msgstr "" - -#: gphoto2/actions.c:559 -#, c-format -msgid "Abilities for camera : %s\n" -msgstr "" - -#: gphoto2/actions.c:560 -#, c-format -msgid "Serial port support : %s\n" -msgstr "" - -#: gphoto2/actions.c:562 -#, c-format -msgid "USB support : %s\n" -msgstr "" - -#: gphoto2/actions.c:565 -msgid "Transfer speeds supported :\n" -msgstr "" - -#: gphoto2/actions.c:567 -#, c-format -msgid " : %i\n" -msgstr "" - -#: gphoto2/actions.c:570 -msgid "Capture choices :\n" -msgstr "" - -#: gphoto2/actions.c:572 -msgid " : Image\n" -msgstr "" - -#: gphoto2/actions.c:576 -msgid " : Video\n" -msgstr "" - -#: gphoto2/actions.c:580 -msgid " : Audio\n" -msgstr "" - -#: gphoto2/actions.c:584 -msgid " : Preview\n" -msgstr "" - -#: gphoto2/actions.c:588 -msgid "" -" : Capture not supported by the driver\n" -msgstr "" - -#: gphoto2/actions.c:590 -#, c-format -msgid "Configuration support : %s\n" -msgstr "" - -#: gphoto2/actions.c:592 -#, c-format -msgid "Delete files on camera support : %s\n" -msgstr "" - -#: gphoto2/actions.c:595 -#, c-format -msgid "File preview (thumbnail) support : %s\n" -msgstr "" - -#: gphoto2/actions.c:598 -#, c-format -msgid "File upload support : %s\n" -msgstr "" - -#: gphoto2/actions.c:615 -#, c-format -msgid "" -"Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a " -"colon so I am going to guess what you mean." -msgstr "" - -#: gphoto2/actions.c:654 -#, c-format -msgid "" -"The port you specified ('%s') can not be found. Please specify one of the " -"ports found by 'gphoto2 --list-ports' and make sure the spelling is correct " -"(i.e. with prefix 'serial:' or 'usb:')." -msgstr "" - -#: gphoto2/actions.c:692 -msgid "About the camera driver:" -msgstr "" - -#: gphoto2/actions.c:706 -msgid "Camera summary:" -msgstr "" - -#: gphoto2/actions.c:720 -msgid "Camera manual:" -msgstr "" - -#: gphoto2/actions.c:736 -msgid "You can only specify speeds for serial ports." -msgstr "" - -#: gphoto2/actions.c:787 -#, c-format -msgid "" -"gphoto2 %s\n" -"\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" -"%s\n" -"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" -"redistribute copies of gphoto2 under the terms of the GNU General Public\n" -"License. For more information about these matters, see the files named " -"COPYING.\n" -"\n" -"This version of gphoto2 is using the following software versions and " -"options:\n" -msgstr "" - -#: gphoto2/actions.c:800 -msgid "OS/2 port by Bart van Leeuwen\n" -msgstr "" - -#: gphoto2/actions.c:915 -msgid "" -"ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE " -"MAILING LIST:" -msgstr "" - -#: gphoto2/foreach.c:254 -#, c-format -msgid "" -"Bad file number. You specified %i, but there are only %i files available in " -"'%s' or its subfolders. Please obtain a valid file number from a file " -"listing first." -msgstr "" - -#: gphoto2/foreach.c:283 -#, c-format -msgid "" -"Bad file number. You specified %i, but there is only 1 file available in '%" -"s'." -msgstr "" - -#: gphoto2/foreach.c:291 -#, c-format -msgid "" -"Bad file number. You specified %i, but there are only %i files available in " -"'%s'.Please obtain a valid file number from a file listing first." -msgstr "" - -#: gphoto2/gp-params.c:53 -msgid "*** Error *** \n" -msgstr "" - -#: gphoto2/gp-params.c:220 -msgid "Press any key to continue.\n" -msgstr "" - -#: gphoto2/gp-params.c:237 -msgid "Not enough memory." -msgstr "" - -#: gphoto2/gphoto2-cmd-capture.c:201 -msgid "Operation cancelled" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:55 -msgid "Continue" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:55 -msgid "Cancel" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:61 -msgid "Error" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:63 -msgid "Could not set configuration:" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:107 -msgid "Exit" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:109 -msgid "Back" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:254 -msgid "Time: " -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:313 gphoto2/gphoto2-cmd-config.c:341 -#: gphoto2/gphoto2-cmd-config.c:401 gphoto2/gphoto2-cmd-config.c:464 -msgid "Value: " -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:363 -msgid "Yes" -msgstr "" - -#: gphoto2/gphoto2-cmd-config.c:363 -msgid "No" -msgstr "" - -#: gphoto2/main.c:161 gphoto2/main.c:1486 -msgid "Turn on debugging" -msgstr "" - -#: gphoto2/main.c:162 gphoto2/main.c:1488 -msgid "Quiet output (default=verbose)" -msgstr "" - -#: gphoto2/main.c:166 gphoto2/main.c:1492 -msgid "Display version and exit" -msgstr "" - -#: gphoto2/main.c:167 -msgid "Displays this help screen" -msgstr "" - -#: gphoto2/main.c:168 gphoto2/main.c:1494 -msgid "List supported camera models" -msgstr "" - -#: gphoto2/main.c:169 gphoto2/main.c:1496 -msgid "List supported port devices" -msgstr "" - -#: gphoto2/main.c:170 gphoto2/main.c:1498 -msgid "Send file to stdout" -msgstr "" - -#: gphoto2/main.c:171 gphoto2/main.c:1500 -msgid "Print filesize before data" -msgstr "" - -#: gphoto2/main.c:172 gphoto2/main.c:1502 -msgid "List auto-detected cameras" -msgstr "" - -#: gphoto2/main.c:175 gphoto2/main.c:1504 -msgid "Specify port device" -msgstr "" - -#: gphoto2/main.c:176 gphoto2/main.c:1506 -msgid "Specify serial transfer speed" -msgstr "" - -#: gphoto2/main.c:177 gphoto2/main.c:1508 -msgid "Specify camera model" -msgstr "" - -#: gphoto2/main.c:178 gphoto2/main.c:1510 -msgid "Specify a filename" -msgstr "" - -#: gphoto2/main.c:179 gphoto2/main.c:1512 -msgid "(expert only) Override USB IDs" -msgstr "" - -#: gphoto2/main.c:182 gphoto2/main.c:1514 -msgid "Display camera abilities" -msgstr "" - -#: gphoto2/main.c:183 gphoto2/main.c:1516 -msgid "Specify camera folder (default=\"/\")" -msgstr "" - -#: gphoto2/main.c:184 gphoto2/main.c:1518 -msgid "Recursion (default for download)" -msgstr "" - -#: gphoto2/main.c:185 gphoto2/main.c:1520 -msgid "No recursion (default for deletion)" -msgstr "" - -#: gphoto2/main.c:186 gphoto2/main.c:1522 -msgid "List folders in folder" -msgstr "" - -#: gphoto2/main.c:187 gphoto2/main.c:1524 -msgid "List files in folder" -msgstr "" - -#: gphoto2/main.c:188 gphoto2/main.c:189 -msgid "name" -msgstr "" - -#: gphoto2/main.c:188 gphoto2/main.c:1526 -msgid "Create a directory" -msgstr "" - -#: gphoto2/main.c:189 gphoto2/main.c:1528 -msgid "Remove a directory" -msgstr "" - -#: gphoto2/main.c:190 gphoto2/main.c:1530 -msgid "Display number of files" -msgstr "" - -#: gphoto2/main.c:191 gphoto2/main.c:1532 -msgid "Get files given in range" -msgstr "" - -#: gphoto2/main.c:192 gphoto2/main.c:1534 -msgid "Get all files from folder" -msgstr "" - -#: gphoto2/main.c:193 gphoto2/main.c:1536 -msgid "Get thumbnails given in range" -msgstr "" - -#: gphoto2/main.c:194 gphoto2/main.c:1539 -msgid "Get all thumbnails from folder" -msgstr "" - -#: gphoto2/main.c:195 gphoto2/main.c:1542 -msgid "Get raw data given in range" -msgstr "" - -#: gphoto2/main.c:196 gphoto2/main.c:1545 -msgid "Get all raw data from folder" -msgstr "" - -#: gphoto2/main.c:197 gphoto2/main.c:1548 -msgid "Get audio data given in range" -msgstr "" - -#: gphoto2/main.c:198 gphoto2/main.c:1551 -msgid "Get all audio data from folder" -msgstr "" - -#: gphoto2/main.c:199 gphoto2/main.c:1553 -msgid "Delete files given in range" -msgstr "" - -#: gphoto2/main.c:200 gphoto2/main.c:1555 -msgid "Delete all files in folder" -msgstr "" - -#: gphoto2/main.c:201 gphoto2/main.c:1557 -msgid "Upload a file to camera" -msgstr "" - -#: gphoto2/main.c:203 gphoto2/main.c:1560 -msgid "Configure" -msgstr "" - -#: gphoto2/main.c:205 gphoto2/main.c:1564 -msgid "Capture a quick preview" -msgstr "" - -#: gphoto2/main.c:206 gphoto2/main.c:1566 -msgid "Capture an image" -msgstr "" - -#: gphoto2/main.c:207 -msgid "Capture a movie " -msgstr "" - -#: gphoto2/main.c:208 gphoto2/main.c:1570 -msgid "Capture an audio clip" -msgstr "" - -#: gphoto2/main.c:210 gphoto2/main.c:1573 gphoto2/shell.c:113 -msgid "Show EXIF information" -msgstr "" - -#: gphoto2/main.c:212 gphoto2/main.c:1576 gphoto2/shell.c:109 -msgid "Show info" -msgstr "" - -#: gphoto2/main.c:213 -msgid "Summary of camera status" -msgstr "" - -#: gphoto2/main.c:214 -msgid "Camera driver manual" -msgstr "" - -#: gphoto2/main.c:215 -msgid "About the camera driver" -msgstr "" - -#: gphoto2/main.c:216 gphoto2/main.c:1584 -msgid "gPhoto shell" -msgstr "" - -#: gphoto2/main.c:343 gphoto2/main.c:1217 -msgid "" -"Use the following syntax a:b=c:d to treat any USB device detected as a:b as " -"c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" -msgstr "" - -#: gphoto2/main.c:466 -msgid "Jan" -msgstr "" - -#: gphoto2/main.c:466 -msgid "January" -msgstr "" - -#: gphoto2/main.c:467 -msgid "Feb" -msgstr "" - -#: gphoto2/main.c:467 -msgid "February" -msgstr "" - -#: gphoto2/main.c:468 -msgid "Mar" -msgstr "" - -#: gphoto2/main.c:468 -msgid "March" -msgstr "" - -#: gphoto2/main.c:469 -msgid "Apr" -msgstr "" - -#: gphoto2/main.c:469 -msgid "April" -msgstr "" - -#: gphoto2/main.c:470 -msgid "May" -msgstr "" - -#: gphoto2/main.c:471 -msgid "Jun" -msgstr "" - -#: gphoto2/main.c:471 -msgid "June" -msgstr "" - -#: gphoto2/main.c:472 -msgid "Jul" -msgstr "" - -#: gphoto2/main.c:472 -msgid "July" -msgstr "" - -#: gphoto2/main.c:473 -msgid "Aug" -msgstr "" - -#: gphoto2/main.c:473 -msgid "August" -msgstr "" - -#: gphoto2/main.c:474 -msgid "Sep" -msgstr "" - -#: gphoto2/main.c:474 -msgid "September" -msgstr "" - -#: gphoto2/main.c:475 -msgid "Oct" -msgstr "" - -#: gphoto2/main.c:475 -msgid "October" -msgstr "" - -#: gphoto2/main.c:476 -msgid "Nov" -msgstr "" - -#: gphoto2/main.c:476 -msgid "November" -msgstr "" - -#: gphoto2/main.c:477 -msgid "Dec" -msgstr "" - -#: gphoto2/main.c:477 -msgid "December" -msgstr "" - -#: gphoto2/main.c:484 -msgid "Sun" -msgstr "" - -#: gphoto2/main.c:484 -msgid "Sunday" -msgstr "" - -#: gphoto2/main.c:485 -msgid "Mon" -msgstr "" - -#: gphoto2/main.c:485 -msgid "Monday" -msgstr "" - -#: gphoto2/main.c:486 -msgid "Tue" -msgstr "" - -#: gphoto2/main.c:486 -msgid "Tuesday" -msgstr "" - -#: gphoto2/main.c:487 -msgid "Wed" -msgstr "" - -#: gphoto2/main.c:487 -msgid "Wednesday" -msgstr "" - -#: gphoto2/main.c:488 -msgid "Thu" -msgstr "" - -#: gphoto2/main.c:488 -msgid "Thursday" -msgstr "" - -#: gphoto2/main.c:489 -msgid "Fri" -msgstr "" - -#: gphoto2/main.c:489 -msgid "Friday" -msgstr "" - -#: gphoto2/main.c:490 -msgid "Sat" -msgstr "" - -#: gphoto2/main.c:490 -msgid "Saturday" -msgstr "" - -#: gphoto2/main.c:552 -#, c-format -msgid "You cannot use '%n' in combination with non-persistent files!" -msgstr "" - -#: gphoto2/main.c:575 -#, c-format -msgid "The filename provided by the camera ('%s') does not contain a suffix!" -msgstr "" - -#: gphoto2/main.c:654 -#, c-format -msgid "Invalid format '%s' (error at position %i)." -msgstr "" - -#: gphoto2/main.c:701 -#, c-format -msgid "File %s exists. Overwrite? [y|n] " -msgstr "" - -#: gphoto2/main.c:712 -msgid "Specify new filename? [y|n] " -msgstr "" - -#: gphoto2/main.c:721 -msgid "Enter new filename: " -msgstr "" - -#: gphoto2/main.c:726 -#, c-format -msgid "Saving file as %s\n" -msgstr "" - -#: gphoto2/main.c:943 -#, c-format -msgid "New file is in location %s%s%s on the camera\n" -msgstr "" - -#: gphoto2/main.c:1075 -msgid "ERROR: " -msgstr "" - -#: gphoto2/main.c:1098 -msgid "" -"\n" -"Aborting...\n" -msgstr "" - -#: gphoto2/main.c:1104 -msgid "Aborted.\n" -msgstr "" - -#: gphoto2/main.c:1109 -msgid "" -"\n" -"Cancelling...\n" -msgstr "" - -#: gphoto2/main.c:1316 -msgid "gphoto2 has been compiled without support for CDK." -msgstr "" - -#: gphoto2/main.c:1429 -msgid "Operation cancelled.\n" -msgstr "" - -#: gphoto2/main.c:1433 -#, c-format -msgid "" -"*** Error (%i: '%s') *** \n" -"\n" -msgstr "" - -#: gphoto2/main.c:1437 -msgid "" -"For debugging messages, please use the --debug option.\n" -"Debugging messages may help finding a solution to your problem.\n" -"If you intend to send any error or debug messages to the gphoto\n" -"developer mailing list , please run\n" -"gphoto2 as follows:\n" -"\n" -msgstr "" - -#: gphoto2/main.c:1490 -msgid "Overwrite files without asking." -msgstr "" - -#: gphoto2/main.c:1504 -msgid "path" -msgstr "" - -#: gphoto2/main.c:1506 -msgid "speed" -msgstr "" - -#: gphoto2/main.c:1508 -msgid "model" -msgstr "" - -#: gphoto2/main.c:1510 -msgid "filename" -msgstr "" - -#: gphoto2/main.c:1512 -msgid "usbid" -msgstr "" - -#: gphoto2/main.c:1516 -msgid "folder" -msgstr "" - -#: gphoto2/main.c:1568 -msgid "Capture a movie" -msgstr "" - -#: gphoto2/main.c:1578 -msgid "Show summary" -msgstr "" - -#: gphoto2/main.c:1580 -msgid "Show camera driver manual" -msgstr "" - -#: gphoto2/main.c:1582 -msgid "About the camera driver manual" -msgstr "" - -#: gphoto2/main.c:1809 -msgid "" -"gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " -"location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" -msgstr "" - -#: gphoto2/main.c:1819 -msgid "" -"gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " -"location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" -msgstr "" - -#: gphoto2/options.c:181 -msgid "Usage:\n" -msgstr "" - -#: gphoto2/options.c:184 -msgid "" -"Short/long options (& argument) Description\n" -"--------------------------------------------------------------------------------\n" -msgstr "" - -#: gphoto2/options.c:209 -#, c-format -msgid "%-38s %s\n" -msgstr "" - -#: gphoto2/options.c:214 -msgid "" -"--------------------------------------------------------------------------------\n" -"[Use double-quotes around arguments] [Picture numbers begin with one " -"(1)]\n" -msgstr "" - -#: gphoto2/range.c:103 gphoto2/range.c:157 -#, c-format -msgid "" -"%s\n" -"Image IDs must be a number greater than zero." -msgstr "" - -#: gphoto2/range.c:109 gphoto2/range.c:163 -#, c-format -msgid "" -"%s\n" -"Image ID %i too high." -msgstr "" - -#: gphoto2/range.c:125 -#, c-format -msgid "" -"%s\n" -"Ranges must be separated by ','." -msgstr "" - -#: gphoto2/range.c:139 -#, c-format -msgid "" -"%s\n" -"Ranges need to start with a number." -msgstr "" - -#: gphoto2/range.c:179 -#, c-format -msgid "" -"%s\n" -"Unexpected character '%c'." -msgstr "" - -#: gphoto2/range.c:202 -#, c-format -msgid "" -"%s\n" -"Decreasing ranges are not allowed. You specified a range from %i to %i." -msgstr "" - -#: gphoto2/shell.c:55 -#, c-format -msgid "*** Error (%i: '%s') ***" -msgstr "" - -#: gphoto2/shell.c:98 -msgid "Change to a directory on the camera" -msgstr "" - -#: gphoto2/shell.c:99 gphoto2/shell.c:101 -msgid "directory" -msgstr "" - -#: gphoto2/shell.c:100 -msgid "Change to a directory on the local drive" -msgstr "" - -#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 -msgid "Exit the gPhoto shell" -msgstr "" - -#: gphoto2/shell.c:103 -msgid "Download a file" -msgstr "" - -#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 -#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 -msgid "[directory/]filename" -msgstr "" - -#: gphoto2/shell.c:105 -msgid "Download a thumbnail" -msgstr "" - -#: gphoto2/shell.c:107 -msgid "Download raw data" -msgstr "" - -#: gphoto2/shell.c:111 -msgid "Delete" -msgstr "" - -#: gphoto2/shell.c:116 gphoto2/shell.c:122 -msgid "Displays command usage" -msgstr "" - -#: gphoto2/shell.c:117 gphoto2/shell.c:122 -msgid "[command]" -msgstr "" - -#: gphoto2/shell.c:118 -msgid "List the contents of the current directory" -msgstr "" - -#: gphoto2/shell.c:119 -msgid "[directory/]" -msgstr "" - -#: gphoto2/shell.c:421 -msgid "Invalid command." -msgstr "" - -#: gphoto2/shell.c:430 -#, c-format -msgid "The command '%s' requires an argument." -msgstr "" - -#: gphoto2/shell.c:483 -msgid "Invalid path." -msgstr "" - -#: gphoto2/shell.c:529 -msgid "Could not find home directory." -msgstr "" - -#: gphoto2/shell.c:537 -#, c-format -msgid "Could not change to local directory '%s'." -msgstr "" - -#: gphoto2/shell.c:540 -#, c-format -msgid "Local directory now '%s'." -msgstr "" - -#: gphoto2/shell.c:578 -#, c-format -msgid "Remote directory now '%s'." -msgstr "" - -#: gphoto2/shell.c:734 -#, c-format -msgid "Command '%s' not found. Use 'help' to get a list of available commands." -msgstr "" - -#: gphoto2/shell.c:741 -#, c-format -msgid "Help on \"%s\":" -msgstr "" - -#: gphoto2/shell.c:743 -msgid "Usage:" -msgstr "" - -#: gphoto2/shell.c:747 -msgid "Description:" -msgstr "" - -#: gphoto2/shell.c:749 -msgid "* Arguments in brackets [] are optional" -msgstr "" - -#: gphoto2/shell.c:770 -msgid "Available commands:" -msgstr "" - -#: gphoto2/shell.c:775 -msgid "To get help on a particular command, type in 'help command-name'." -msgstr "" diff -Naur gphoto2-2.1.4/po/hu.po gphoto2/po/hu.po --- gphoto2-2.1.4/po/hu.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/hu.po 2004-02-08 18:35:49.000000000 +0100 @@ -0,0 +1,1106 @@ +# Magyar nyelv szvegek a gphoto2 programhoz. +# Copyright (C) 2002 Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# Mihly Gyulai , 2003. +# +msgid "" +msgstr "" +"Project-Id-Version: gphoto2 2.1.2\n" +"POT-Creation-Date: 2003-08-10 20:58+0200\n" +"PO-Revision-Date: 2003-10-13 18:52+0200\n" +"Last-Translator: Mihly Gyulai \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "A '%s' knyvtrban lv fjlok szma: %i\n" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "A '%s' knyvtr alatt nincs alknyvtr." + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "A(z) '%s' knyvtrban egy alknyvtr van:" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "%i alknyvtr van a(z) '%s' knyvtrban:" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "A(z) '%s' knyvtrban nincsen fjl." + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "A(z) '%s' knyvtrban egy fjl van:" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "%i fjl van a(z) '%s' knyvtrban:" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "Informci errl a fjlrl: '%s' ('%s' knyvtrban)\n" + +#: gphoto2/actions.c:190 +msgid "File:\n" +msgstr "Fjl:\n" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +msgid " None available.\n" +msgstr " Nem hozzfrhet.\n" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr " Nv: '%s'\n" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " MIME tpus: '%s'\n" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Mret: %li bjt\n" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr " Szlessg: %i pixel\n" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr " Magassg: %i pixel\n" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Letltve: %s\n" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "yes" +msgstr "igen" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "no" +msgstr "nem" + +#: gphoto2/actions.c:208 +msgid " Permissions: " +msgstr " Engedlyek: " + +#: gphoto2/actions.c:211 +msgid "read/delete" +msgstr "olvas/trl" + +#: gphoto2/actions.c:213 +msgid "read" +msgstr "olvas" + +#: gphoto2/actions.c:215 +msgid "delete" +msgstr "trl" + +#: gphoto2/actions.c:217 +msgid "none" +msgstr "nincs" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr " Id: %s" + +#: gphoto2/actions.c:224 +msgid "Thumbnail:\n" +msgstr "Bemutatkp:\n" + +#: gphoto2/actions.c:240 +msgid "Audio data:\n" +msgstr "Hanganyag:\n" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " MIME tpus: '%s'\n" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Mret: %li bjt\n" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Letltve: %s\n" + +#: gphoto2/actions.c:380 +msgid "Could not parse EXIF data." +msgstr "Nem tudom rtelmezni az EXIF adatot." + +#: gphoto2/actions.c:384 +msgid "EXIF tags:" +msgstr "EXIF elemek:" + +#: gphoto2/actions.c:387 +msgid "Tag" +msgstr "Elem" + +#: gphoto2/actions.c:389 +msgid "Value" +msgstr "rtk" + +#: gphoto2/actions.c:410 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "Az EXIF adat bemutatkpet tartalmaz (%i bjt)." + +#: gphoto2/actions.c:419 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "A gphoto2 EXIF tmogats nlkl lett elksztve." + +#: gphoto2/actions.c:437 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "Tmogatott fnykpezgpek szma: %i\n" + +#: gphoto2/actions.c:439 +msgid "Supported cameras:\n" +msgstr "Tmogatott fnykpezgpek:\n" + +#: gphoto2/actions.c:452 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "\t\"%s\" (TESZTELS)\n" + +#: gphoto2/actions.c:455 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "\t\"%s\" (KSRLETI)\n" + +#: gphoto2/actions.c:460 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t\"%s\"\n" + +#: gphoto2/actions.c:488 +#, c-format +msgid "Devices found: %i\n" +msgstr "Tallt eszkzk: %i\n" + +#: gphoto2/actions.c:489 +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" +"tvonal Lers\n" +"--------------------------------------------------------------\n" + +#: gphoto2/actions.c:528 gphoto2/actions.c:533 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:528 +msgid "Model" +msgstr "Modell" + +#: gphoto2/actions.c:528 +msgid "Port" +msgstr "Port" + +#: gphoto2/actions.c:529 +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:546 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "A kamera kpessgei : %s\n" + +#: gphoto2/actions.c:547 +#, c-format +msgid "Serial port support : %s\n" +msgstr "Soros port tmogatsa : %s\n" + +#: gphoto2/actions.c:549 +#, c-format +msgid "USB support : %s\n" +msgstr "USB tmogats : %s\n" + +#: gphoto2/actions.c:552 +msgid "Transfer speeds supported :\n" +msgstr "tviteli sebessgek :\n" + +#: gphoto2/actions.c:554 +#, c-format +msgid " : %i\n" +msgstr " : %i\n" + +#: gphoto2/actions.c:557 +msgid "Capture choices :\n" +msgstr "Leszedsi lehetsgek :\n" + +#: gphoto2/actions.c:559 +msgid " : Image\n" +msgstr " : Kp\n" + +#: gphoto2/actions.c:561 +msgid " : Video\n" +msgstr " : Video\n" + +#: gphoto2/actions.c:563 +msgid " : Audio\n" +msgstr " : Hang\n" + +#: gphoto2/actions.c:565 +msgid " : Preview\n" +msgstr " : Elnzet\n" + +#: gphoto2/actions.c:566 +#, c-format +msgid "Configuration support : %s\n" +msgstr "Belltsok tmogatsa : %s\n" + +#: gphoto2/actions.c:568 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "Fjltrls tmogatsa a kamerban: %s\n" + +#: gphoto2/actions.c:571 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "Bemutatkp tmogatsa : %s\n" + +#: gphoto2/actions.c:574 +#, c-format +msgid "File upload support : %s\n" +msgstr "Fjl-feltlts tmogatsa : %s\n" + +#: gphoto2/actions.c:591 +#, c-format +msgid "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." +msgstr "A portot ilyen formban kell megadni: 'serial:/dev/ttyS0', vagy 'usb:', de a(z) '%s'-ban hinyzik a kettspont, de megprblom kitallni, hogy lenne helyes." + +#: gphoto2/actions.c:630 +#, c-format +msgid "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." +msgstr "Nem tallom a megadott portot ('%s'). Olyan portot kell megadni, amit a 'gphoto2 --list-ports' parancs megtall. Ellenrizd, hogy jl rtad be! (serial: vagy usb: legyen az elejn)" + +#: gphoto2/actions.c:668 +msgid "About the camera driver:" +msgstr "A kamera meghajtprogramja:" + +#: gphoto2/actions.c:682 +msgid "Camera summary:" +msgstr "Kamera sszefoglal:" + +#: gphoto2/actions.c:696 +msgid "Camera manual:" +msgstr "Kamera kziknyv:" + +#: gphoto2/actions.c:712 +msgid "You can only specify speeds for serial ports." +msgstr "Csak a soros port sebessget lehet megadni." + +#: gphoto2/actions.c:763 +#, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" +msgstr "" +"gphoto2 %s\n" +"\n" +"Copyright (C) 2000-2004 Lutz Mueller s msok\n" +"%s\n" +"A gphoto2 programra nem vonatkozik SEMMILYEN GARANCIA, kivve, ha a\n" +"trvny mskpp nem rendelkezik. A gphoto2 pldnyokat tovbb lehet\n" +"adni a GNU General Public License rendelkezsei alapjn. Tovbbi \n" +"informcikrt olvasd el a COPYING fjlt.\n" +"\n" +"A gphoto2 ezen verzija a kvetkez programverzikat s opcikat hasznlja:\n" + +#: gphoto2/actions.c:776 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "OS/2-re tltette Bart van Leeuwen\n" + +#: gphoto2/actions.c:890 +msgid "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" +msgstr "A KVETKEZ SOROKAT MINDIG ADD MEG, HA HIBAKERESS CLJBL A LEVELEZLISTRA RSZ:" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." +msgstr "Hibs a fjlok szma. Ennyit adtl meg: %i, de csak %i fjl van ebben a knyvtrban: '%s' (illetve az alknyvtraiban). A helyes rtket a fjlok listzsbl olvashatod ki." + +#: gphoto2/foreach.c:283 +#, c-format +msgid "Bad file number. You specified %i, but there is only 1 file available in '%s'." +msgstr "Hibs a fjlok szma. %i-t adtl meg, de csak 1 hozzfrhet fjl van itt: '%s'." + +#: gphoto2/foreach.c:291 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." +msgstr "Hibs a fjlok szma. %i-t adtl meg, de csak %i hozzfrhet fjl van itt: '%s'. A fjlok szmt a fjlok listjbl tudhatod meg." + +#: gphoto2/gp-params.c:53 +msgid "*** Error *** \n" +msgstr "*** Hiba *** \n" + +#: gphoto2/gp-params.c:220 +msgid "Press any key to continue.\n" +msgstr "Nyomj meg egy billentyt a folytatshoz.\n" + +#: gphoto2/gp-params.c:237 +msgid "Not enough memory." +msgstr "Nincs elg memria." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Mvelet megszaktva" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Folytats" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Mgsem" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Hiba" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Nem tudom belltani a konfigurcit:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Kilps" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Vissza" + +#: gphoto2/gphoto2-cmd-config.c:253 +msgid "Time: " +msgstr "Id: " + +#: gphoto2/gphoto2-cmd-config.c:312 gphoto2/gphoto2-cmd-config.c:340 +#: gphoto2/gphoto2-cmd-config.c:400 gphoto2/gphoto2-cmd-config.c:463 +msgid "Value: " +msgstr "rtk: " + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "Yes" +msgstr "Igen" + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "No" +msgstr "Nem" + +#: gphoto2/main.c:161 gphoto2/main.c:1461 +msgid "Turn on debugging" +msgstr "Hibakeress bekapcsolva" + +#: gphoto2/main.c:162 gphoto2/main.c:1463 +msgid "Quiet output (default=verbose)" +msgstr "Csendes kimenet (alapban: bbeszd)" + +#: gphoto2/main.c:166 gphoto2/main.c:1467 +msgid "Display version and exit" +msgstr "Verzi kirsa s kilps" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Ez a sg oldal" + +#: gphoto2/main.c:168 gphoto2/main.c:1469 +msgid "List supported camera models" +msgstr "Tmogatott kamerk listja" + +#: gphoto2/main.c:169 gphoto2/main.c:1471 +msgid "List supported port devices" +msgstr "Tmogatott port eszkzk listja" + +#: gphoto2/main.c:170 gphoto2/main.c:1473 +msgid "Send file to stdout" +msgstr "Fjl kldse az stdout-ra" + +#: gphoto2/main.c:171 gphoto2/main.c:1475 +msgid "Print filesize before data" +msgstr "Fjlmret nyomtatsa az adatok eltt" + +#: gphoto2/main.c:172 gphoto2/main.c:1477 +msgid "List auto-detected cameras" +msgstr "Felismert kamerk listja" + +#: gphoto2/main.c:175 gphoto2/main.c:1479 +msgid "Specify port device" +msgstr "Port eszkz megadsa" + +#: gphoto2/main.c:176 gphoto2/main.c:1481 +msgid "Specify serial transfer speed" +msgstr "Soros tviteli sebessg megadsa" + +#: gphoto2/main.c:177 gphoto2/main.c:1483 +msgid "Specify camera model" +msgstr "Kamera tpusnak megadsa" + +#: gphoto2/main.c:178 gphoto2/main.c:1485 +msgid "Specify a filename" +msgstr "Fjlnv megadsa" + +#: gphoto2/main.c:179 gphoto2/main.c:1487 +msgid "(expert only) Override USB IDs" +msgstr "(csak szakrtknek) USB ID-k fellrsa" + +#: gphoto2/main.c:182 gphoto2/main.c:1489 +msgid "Display camera abilities" +msgstr "Kamera kpessgeinek kirsa" + +#: gphoto2/main.c:183 gphoto2/main.c:1491 +msgid "Specify camera folder (default=\"/\")" +msgstr "Kamera knyvtrnak megadsa (alapbl: \"/\")" + +#: gphoto2/main.c:184 gphoto2/main.c:1493 +msgid "Recursion (default for download)" +msgstr "Rekurzi (alaprtelmezs letltskor)" + +#: gphoto2/main.c:185 gphoto2/main.c:1495 +msgid "No recursion (default for deletion)" +msgstr "Nincs rekurzi (trlskor alaprtelmezs)" + +#: gphoto2/main.c:186 gphoto2/main.c:1497 +msgid "List folders in folder" +msgstr "Knyvtrban lv alknyvtrak listzsa" + +#: gphoto2/main.c:187 gphoto2/main.c:1499 +msgid "List files in folder" +msgstr "Knyvtrban lv fjlok listzsa" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "nv" + +#: gphoto2/main.c:188 gphoto2/main.c:1501 +msgid "Create a directory" +msgstr "Knyvtr ltrehozsa" + +#: gphoto2/main.c:189 gphoto2/main.c:1503 +msgid "Remove a directory" +msgstr "Knyvtr trlse" + +#: gphoto2/main.c:190 gphoto2/main.c:1505 +msgid "Display number of files" +msgstr "Fjlok szmnak kirsa" + +#: gphoto2/main.c:191 gphoto2/main.c:1507 +msgid "Get files given in range" +msgstr "A megadott tartomnyban lv fjlok letltse" + +#: gphoto2/main.c:192 gphoto2/main.c:1509 +msgid "Get all files from folder" +msgstr "A knyvtrban lv sszes fjl letltse" + +#: gphoto2/main.c:193 gphoto2/main.c:1511 +msgid "Get thumbnails given in range" +msgstr "A tartomnyban megadott bemutatkpek letltse" + +#: gphoto2/main.c:194 gphoto2/main.c:1514 +msgid "Get all thumbnails from folder" +msgstr "sszes bemutatkp letltse a knyvtrbl" + +#: gphoto2/main.c:195 gphoto2/main.c:1517 +msgid "Get raw data given in range" +msgstr "Nyers adatok letltse a megadott tartomnybl" + +#: gphoto2/main.c:196 gphoto2/main.c:1520 +msgid "Get all raw data from folder" +msgstr "Nyers adatok letltse knyvtrbl" + +#: gphoto2/main.c:197 gphoto2/main.c:1523 +msgid "Get audio data given in range" +msgstr "Audio adatok letltse a megadott tartomnybl" + +#: gphoto2/main.c:198 gphoto2/main.c:1526 +msgid "Get all audio data from folder" +msgstr "sszes audio adat letltse knyvtrbl" + +#: gphoto2/main.c:199 gphoto2/main.c:1528 +msgid "Delete files given in range" +msgstr "A tartomnyban megadott fjlok trlse" + +#: gphoto2/main.c:200 gphoto2/main.c:1530 +msgid "Delete all files in folder" +msgstr "A knyvtrban lv sszes fjl trlse" + +#: gphoto2/main.c:201 gphoto2/main.c:1532 +msgid "Upload a file to camera" +msgstr "Fjl feltltse a kamerba" + +#: gphoto2/main.c:203 gphoto2/main.c:1535 +msgid "Configure" +msgstr "Bellts" + +#: gphoto2/main.c:205 gphoto2/main.c:1539 +msgid "Capture a quick preview" +msgstr "Gyors elnzet ksztse" + +#: gphoto2/main.c:206 gphoto2/main.c:1541 +msgid "Capture an image" +msgstr "Kp ksztse" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Film ksztse " + +#: gphoto2/main.c:208 gphoto2/main.c:1545 +msgid "Capture an audio clip" +msgstr "Audio felvtel ksztse" + +#: gphoto2/main.c:210 gphoto2/main.c:1548 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "EXIF informci mutatsa" + +#: gphoto2/main.c:212 gphoto2/main.c:1551 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Info mutatsa" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "A kamera llapotnak sszegzse" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "A kamera-meghajt kziknyve" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "A kamera-meghajtrl" + +#: gphoto2/main.c:216 gphoto2/main.c:1559 +msgid "gPhoto shell" +msgstr "gPhoto burok" + +#: gphoto2/main.c:343 gphoto2/main.c:1192 +msgid "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "USB eszkz megadshoz hasznld a zrjelben lv mdot (a:b=c:d). Itt \"a:b\" a felismert eszkz, amit \"c:d\" eszkzknt szeretnnk hasznlni. Az a, b, c, d hexadecimlis szmok, '0x'-el kell kezddnik.\n" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "Jan" + +#: gphoto2/main.c:466 +msgid "January" +msgstr "Janur" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "Feb" + +#: gphoto2/main.c:467 +msgid "February" +msgstr "Februr" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "Mrc" + +#: gphoto2/main.c:468 +msgid "March" +msgstr "Mrcius" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "pr" + +#: gphoto2/main.c:469 +msgid "April" +msgstr "prilis" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "Mjus" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "Jn" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "Jnius" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "Jl" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "Jlius" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "Aug" + +#: gphoto2/main.c:473 +msgid "August" +msgstr "Augusztus" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "Szep" + +#: gphoto2/main.c:474 +msgid "September" +msgstr "Szeptember" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "Okt" + +#: gphoto2/main.c:475 +msgid "October" +msgstr "Oktber" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "Nov" + +#: gphoto2/main.c:476 +msgid "November" +msgstr "November" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "Dec" + +#: gphoto2/main.c:477 +msgid "December" +msgstr "December" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "Vas" + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "Vasrnap" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "Ht" + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "Htf" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "Kedd" + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "Kedd" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "Sze" + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "Szerda" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "Cs" + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "Cstrtk" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "Pn" + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "Pntek" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "Szo" + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "Szombat" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "Nem hasznlhatod a(z) '%n'-t nem-lland fjlokkal kapcsolatban!" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "A kamera ltal adott fjlnv ('%s') nem tartalmaz uttagot!" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "rvnytelen formtum '%s' (hibs pozci: %i)." + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "A(z) %s fjl ltezik. Fellrjuk? [y|n] " + +#: gphoto2/main.c:712 +msgid "Specify new filename? [y|n] " +msgstr "j fjlnevet adsz meg? [y|n] " + +#: gphoto2/main.c:721 +msgid "Enter new filename: " +msgstr "j fjlnv megadsa: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Fjl mentse mint %s\n" + +#: gphoto2/main.c:918 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "Az j fjl helye a kamerban: %s%s%s\n" + +#: gphoto2/main.c:1050 +msgid "ERROR: " +msgstr "HIBA: " + +#: gphoto2/main.c:1073 +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Megszakts...\n" + +#: gphoto2/main.c:1079 +msgid "Aborted.\n" +msgstr "Megszaktva.\n" + +#: gphoto2/main.c:1084 +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Kilps...\n" + +#: gphoto2/main.c:1291 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "A gphoto2 CDK tmogats nlkl lett lefordtva." + +#: gphoto2/main.c:1404 +msgid "Operation cancelled.\n" +msgstr "Mvelet megszaktva.\n" + +#: gphoto2/main.c:1408 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Hiba (%i: '%s') *** \n" +"\n" + +#: gphoto2/main.c:1412 +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" +"Hibakeres zenetekhez hasznld a --debug opcit.\n" +"A hibakeres zenetek segthetnek megoldst tallni a problmra.\n" +"Ha szndkodban ll hibajelentst kldeni a gphoto fejlesztk levelezsi\n" +"listjra , lgy szves gy futtasd a gphoto-t:\n" + +#: gphoto2/main.c:1465 +msgid "Overwrite files without asking." +msgstr "Fjlok fellrsa krdezs nlkl." + +#: gphoto2/main.c:1479 +msgid "path" +msgstr "tvonal" + +#: gphoto2/main.c:1481 +msgid "speed" +msgstr "sebessg" + +#: gphoto2/main.c:1483 +msgid "model" +msgstr "tpus" + +#: gphoto2/main.c:1485 +msgid "filename" +msgstr "fjlnv" + +#: gphoto2/main.c:1487 +msgid "usbid" +msgstr "usb id" + +#: gphoto2/main.c:1491 +msgid "folder" +msgstr "knyvtr" + +#: gphoto2/main.c:1543 +msgid "Capture a movie" +msgstr "Mozgkp felvtel" + +#: gphoto2/main.c:1553 +msgid "Show summary" +msgstr "sszegzs" + +#: gphoto2/main.c:1555 +msgid "Show camera driver manual" +msgstr "Kamera meghajt-program kziknyve" + +#: gphoto2/main.c:1557 +msgid "About the camera driver manual" +msgstr "A kamera meghajt-program kziknyvrl" + +#: gphoto2/main.c:1784 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "A gPhoto2 OS/2-es verzija ignyli a CAMLIBS krnyezeti vltoz belltst. Oda mutasson, ahol a kamera fggvnyknyvtrai vannak (pldul SET CAMLIBS=C:\\GPHOTO2\\CAM)\n" + +#: gphoto2/main.c:1794 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "A gPhoto2 OS/2-es verzija ignyli az IOLIBS krnyezeti vltoz belltst. Oda mutasson, ahol az IO fggvnyknyvtrak vannak (pldul SET IOLIBS=C:\\GPHOTO2\\IOLIBS)\n" + +#: gphoto2/options.c:181 +msgid "Usage:\n" +msgstr "Hasznlat:\n" + +#: gphoto2/options.c:184 +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" +"Rvid/hossz opcik (s paramter) Lers\n" +"--------------------------------------------------------------------------------\n" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" +msgstr "" +"--------------------------------------------------------------------------------\n" +"[Hasznlj dupla-idzjelet a paramterek krl] [A kpek szmozsa 1-tl kezddik]\n" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" +"%s\n" +"A kpek azonostjnak nullnl nagyobb szmnak kell lennie." + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" +"%s\n" +"A kp azonostja tl nagy (%i)." + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" +"%s\n" +"A tartomnyt vesszvel kell elvlasztani (,)." + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" +"%s\n" +"A tartomnynak szmmal kell kezddnie." + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" +"%s\n" +"Nem vrt karakter ez: '%c'." + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" +"%s\n" +"Cskken tartomny nincs megengedve. gy adtad meg: %i...%i" + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Hiba (%i: '%s') ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Vlts a kamerban lv knyvtrra" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "knyvtr" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Vlts a helyi meghajtn lv knyvtrra" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "gPhoto burok elhagysa" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Fjl letltse" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[knyvtr/]fjlnv" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Bemutatkp letltse" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Nyers adat letltse" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Trls" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Parancsok mutatsa" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[parancs]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "Aktulis knyvtr tartalmnak listzsa" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[knyvtr/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "rvnytelen parancs." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "A '%s' parancs paramtert ignyel." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "rvnytelen tvonal." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "Nem tallom a HOME knyvtrat." + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "Nem tudok vltani a helyi '%s' knyvtrra." + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "A helyi knyvtr most: '%s'." + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "A tvoli knyvtr most: '%s'." + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "A(z) '%s' parancs nem tallhat. Hasznld a 'help' parancsot az elrhet parancsok listjhoz." + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "\"%s\" Segtsg:" + +#: gphoto2/shell.c:743 +msgid "Usage:" +msgstr "Hasznlat:" + +#: gphoto2/shell.c:747 +msgid "Description:" +msgstr "Lers:" + +#: gphoto2/shell.c:749 +msgid "* Arguments in brackets [] are optional" +msgstr "* A szgletes zrjelben lv paramterek nem ktelezek []" + +#: gphoto2/shell.c:770 +msgid "Available commands:" +msgstr "Elrhet parancsok:" + +#: gphoto2/shell.c:775 +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "Egy bizonyos parancsrl sg krse: 'help parancs-neve'." diff -Naur gphoto2-2.1.4/po/it.gmo gphoto2/po/it.gmo --- gphoto2-2.1.4/po/it.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/it.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -4L`ad?hNoYesProject-Id-Version: gphoto -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: sab lug 22 11:35:36 CEST 2000 -Last-Translator: Daniele Medri -Language-Team: Italian -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8-bit -NoSi \ No newline at end of file diff -Naur gphoto2-2.1.4/po/it.po gphoto2/po/it.po --- gphoto2-2.1.4/po/it.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/it.po 2004-03-22 01:01:43.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: sab lug 22 11:35:36 CEST 2000\n" "Last-Translator: Daniele Medri \n" "Language-Team: Italian \n" @@ -63,11 +63,12 @@ msgstr "" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -#, fuzzy +#, fuzzy, c-format msgid " None available.\n" msgstr "Non disponibile" @@ -115,24 +116,27 @@ msgstr "" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr "" #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "" #: gphoto2/actions.c:213 -#, fuzzy +#, fuzzy, c-format msgid "read" msgstr "Crea" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "" #: gphoto2/actions.c:217 -#, fuzzy +#, fuzzy, c-format msgid "none" msgstr "Eseguito." @@ -142,10 +146,12 @@ msgstr "" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "" @@ -169,6 +175,7 @@ msgstr "" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "" @@ -195,6 +202,7 @@ msgstr "" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "" @@ -219,6 +227,7 @@ msgstr "" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -239,6 +248,7 @@ msgstr "Porta:" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "" @@ -258,6 +268,7 @@ msgstr "" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "" @@ -267,28 +278,32 @@ msgstr "" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr "" #: gphoto2/actions.c:576 -#, fuzzy +#, fuzzy, c-format msgid " : Video\n" msgstr "\t-n visualizza il numero di immagini\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr "" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr "" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr "\t-n visualizza il numero di immagini\n" @@ -329,22 +344,24 @@ msgstr "" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "" #: gphoto2/actions.c:706 -#, fuzzy +#, fuzzy, c-format msgid "Camera summary:" msgstr "" "sommario %s:\n" "%s" #: gphoto2/actions.c:720 -#, fuzzy +#, fuzzy, c-format msgid "Camera manual:" msgstr "Modello fotocamera:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "" @@ -353,7 +370,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -397,14 +414,17 @@ msgstr "" #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -650,6 +670,7 @@ msgstr "Messaggio di gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -825,10 +846,12 @@ msgstr "File %s esistente. Sovrascrivere?" #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "" #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "" @@ -843,21 +866,24 @@ msgstr "" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" msgstr "" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "" #: gphoto2/main.c:1109 -#, fuzzy +#, fuzzy, c-format msgid "" "\n" "Cancelling...\n" @@ -868,7 +894,7 @@ msgstr "" #: gphoto2/main.c:1429 -#, fuzzy +#, fuzzy, c-format msgid "Operation cancelled.\n" msgstr "Download annullato." @@ -880,6 +906,7 @@ msgstr "" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -937,22 +964,26 @@ msgstr "Modello fotocamera:" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" msgstr "" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" msgstr "" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -964,6 +995,7 @@ msgstr "" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1123,21 +1155,26 @@ msgstr "" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" diff -Naur gphoto2-2.1.4/po/ja.gmo gphoto2/po/ja.gmo --- gphoto2-2.1.4/po/ja.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/ja.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -l9 &))>+h)(=P`|  J'0@#q&'!!:;\; K XSe& !:> DQU\puN'7H`v##(G&@ g)q 4&P w"7I*Q -|!&& 4;P T [ z     !#! A!(O!x!+! !!!!!!!!!"("E"*a""""""""-""#"###'# K#l######l#N$uS$$$ %$%?%R%V%_%r%% %&%%@&V& p& z&&#&&&&'"';'?'F'Z'&^'E''"($("($(!)#;)_) c)o)x)A)#))))&***B*I*Q**** *+-+=4+ r+ |+++ +++ ++X,/,2-C-I-N-Q-V-[- `-l-r-x-O|-... ./&/.:/(i/./*//0030H0\0q000000 0 0H1N1$m1 111"1222"L2;o22 G3S3 d3Qr3&333"434H4L4P4c4g4k44435Z56<6P6`6q6666#6"6, 7S97&7747,7#8'?8g8z88888&88899 09Q9j99999/9 -9 -::":<:@:1D:&v:&: -:@:<<"< =< ^<"<<<<<=&)=P=$m========"==> >01>"b>(>>>>>>>!>>>??#?=?+]?????"?e?S@oZ@$@@" -A*-AXAkAnAuAAAA&A}A[B&kB -B BB+BB'C0CKCjC}CCCC"C:CC.D.D* -E*5E+`E+EE EEEQE#(FLFOFVF&kFFFFFAGDGIGLGSG4XG8G -GGGG H - H -H #H1HH-i#Jy 421~fGF9!KcE?s;3 [QYdoI -H(bDv :TPRx`AXz|lVwm=^]a*'O5W{.k "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 2.1.1rc2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2002-11-25 08:16+0900 -Last-Translator: Takeshi Aihana -Language-Team: Japanese -MIME-Version: 1.0 -Content-Type: text/plain; charset=euc-jp -Content-Transfer-Encoding: 8bit - "%s" - "%s" (ȯ) - "%s" (ƥ) - -... - -󥻥... - : %i - : ǥ - : - : ץӥ塼 - : ӥǥ - ɺ: %s - ɺ: %s - : %i ԥ - MIME : '%s' - MIME : '%s' - ̾: '%s' - ԲĤǤ - : : %li Х - : %li Х - : %s : %i ԥ -%-30s %-16s -%-38s %s -%s -ϰϤ򾮤뤳ȤϤǤޤ%i %i ϰϤǻꤷƲ%s - ID %i 礭ޤ%s - ID 0 ʾˤƲ%s -ϰϤ ',' ǶڤäƲ%s -ϰϤϿͤǻϤƲ%s -ͽʤʸ '%c' ǤUSB ID ξ (ѡȸ)* [] ΰϥץǤ*** 顼 (%i: '%s') ****** 顼 (%i: '%s') *** - ----------------------------------------------------------- --------------------------------------------------------------------------------- -[˥֥륯ơѤ] [ֹ̿ (1) Ϥ] -³󥻥顼᡼󥰥ꥹȤ˥ǥХååϡɬιԤƲ:ǽ : %s -ߤޤ -Υɥ饤оΥɥ饤ФΥޥ˥奢ξΥɥ饤о44ǥǡ: -88Ѳǽʥޥ:եֹ椬Ǥ%i ꤷޤ%i ĤΥե뤷 '%s' ˤϤʤޤϥ֥եΤ褦Ǥޤǽ˥եֹƲեֹ椬Ǥ%i ޤ%i ĤΥե뤷 '%s' ˤޤ󡣤ޤǽ˥եֹƲեֹ椬Ǥ%i ꤷޤ1ĤΥե뤷 '%s' ˤޤΥɥ饤ФΥޥ˥奢Υޥ˥奢:Υޥ:ΥץΥץץδʰץץӥ塼ǥΥץΥץץ : -ǥǥ쥯ȥѹޤǥǥǥ쥯ȥѹޤޥ '%s' ĤޤǤ'help' Ѳǽʥޥɰɽޤåƥ󥰤Υݡ : %s -Υǥ쥯ȥ '%s' ˰ưǤޤǤۡࡦǥ쥯ȥ꤬ĤޤǤEXIF ǡϤǤޤǤͭˤ뤳ȤޤǤ:ǥ쥯ȥκ1212եΥեꤷϰϤǥեκΥեΥݡ : %s -:ФǥХ: %i -ǽɽեɽСɽƽλޥɤˡɽΥإפɽեΥͥΥǡΥ顼: EXIF ǡ˥ͥ뤬ޤ (%i Х)EXIF :ե̾: λgPhoto λޤ22ե %s ¸ߤޤ񤭤ޤ [y|n] ץӥ塼Υݡ : %s -File upload support : %s -ե: -ǥХåϡ--debug ץѤƲ -ǥХååȯФĤβˡƳˤʤޤ -顼ˤĤƼ䤹硢ޤϥǥХåå -gPhoto2 ȯԤΥ᡼󥰥ꥹ -ʲΤ褦 gphoto2 ưƲ: - -ե饪ǥǡμեƤΥեμեƤǡμեƤΥͥμꤷǥǡμꤷϰϤǥեμꤷϰϤǡμꤷϰϤǥͥμ"%s" Υإ:ե '%s' (ե '%s') ξ: -ޥɤޤʽ '%s' (%i ǥ顼) Ǥѥ̾ޤ117766ưФΰɽեΥեեΰݡȤƤ륫鷿ΰݡȤƤݡȡǥХΰɽΥǥ쥯ȥΰɽޤߤΥǥ쥯ȥ '%s' Ǥ335եγǼ: %s%s%s -Ƶʤ (ǥե=)1111ե '%s' Υեο: %i -ݡȤƤ륫ο: %i -Bart van Leeuwen : OS/2 Υݡƥô -1010򥭥󥻥뤷ޤ󥻥뤵ޤ -եξ񤭤䤤碌ʤѥ̾ --------------------------------------------------------------- -ݡݡȤ 'serial:/dev/ttyS0' ޤ 'USB:' Τ褦Ǥ'%s' ϥ ':' ʤΤŬѤ뤳ȤǤޤǡ˥ե륵Ϥʰ׽ (ǥե=ܺ)Ƶ (ǥե=)ߤΥ⡼ȤΥǥ쥯ȥ '%s' Ǥǥ쥯ȥκե %s ¸ޤ -ɸϤ˥եФ99ꥢݡȤΥݡ : %s -ץ (ޤ) --------------------------------------------------------------------------------- -EXIF ɽΥɥ饤ФΥޥ˥奢ɽɽޥɽե̾ꤹΥեꤹ (ǥե="/")ηꤷƲե̾ꤷޤ [y|n] ݡȡǥХꤹꥢžԡɤꤹ֤ΥޥݡȤ륫: -ޥ '%s' ˤϰɬפǤ餬󶡤ե̾ ('%s') ˤϳĥҤޤꤷݡ ('%s') Ĥޤ'gphoto2 --list-ports' ǼݡȤΰĤꤷơݡ̾Υڥ뤬ǧƲ (Ƭ 'serial:' ޤ 'usb:')%i ĤΥե뤬ե '%s' ˤޤ:%i ĤΥեե '%s' ˤޤ:ե '%s' ˥եϤޤե '%s' ˥եϤޤե '%s' ˥ե뤬Ĥޤ:ե '%s' ˥եĤޤ:ͥ: -: ΥޥɤФإפɽ 'help ޥ̾' ϤƲݡȤžԡ : -ǥХåͭˤUSB ݡ : %s -ե򥫥˥åץˡ:ˡ: -Ф줿 USB ǥХѤ뤿 a:b=c:d Ȥ񼰤ѤƲa, b, c, d '0x' ǻϤޤ 16 ʤοͤˤƲ -: ϤꥢݡȤž®٤Τ߻ꤹ뤳ȤǽǤѥեȰ '%n' Ѥ뤳ȤϤǤޤ[ޥ][ǥ쥯ȥ/][ǥ쥯ȥ/]ե̾ǥ쥯ȥե̾ե̾gPhoto OS/2 gPhoto2 ǤϴĶѿ ${CAMLIBS} ˥顦饤֥ؤΥѥꤹɬפޤ() SET CAMLIBS=C:\GPHOTO2\CAM -OS/2 gPhoto2 ǤϴĶѿ ${IOLIBS} ˥ I/O 饤֥ؤΥѥꤹɬפޤ() SET IOLIBS=C:\GPHOTO2\IOLIB - gphoto2 EXIF 򥵥ݡȤƤޤ gphoto2 CDK 򥵥ݡȤƤޤ̾ʤѥ̾ɤ߹ɤ߹/žԡUSB-IDϤ \ No newline at end of file diff -Naur gphoto2-2.1.4/po/ja.po gphoto2/po/ja.po --- gphoto2-2.1.4/po/ja.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/ja.po 2004-03-22 01:01:43.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gphoto2 2.1.1rc2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2002-11-25 08:16+0900\n" "Last-Translator: Takeshi Aihana \n" "Language-Team: Japanese \n" @@ -57,10 +57,12 @@ msgstr "ե '%s' (ե '%s') ξ:\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "ե:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " ԲĤǤ\n" @@ -107,22 +109,27 @@ msgstr "" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " : " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "ɤ߹/" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "ɤ߹" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "ʤ" @@ -132,10 +139,12 @@ msgstr " : %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "ͥ:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "ǥǡ:\n" @@ -159,6 +168,7 @@ msgstr "EXIF ǡϤǤޤǤ" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "EXIF :" @@ -185,6 +195,7 @@ msgstr "ݡȤƤ륫ο: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "ݡȤ륫:\n" @@ -209,6 +220,7 @@ msgstr "ФǥХ: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -230,6 +242,7 @@ msgstr "ݡ" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -249,6 +262,7 @@ msgstr "USB ݡ : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "ݡȤžԡ :\n" @@ -258,27 +272,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "ץ :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : \n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : ӥǥ\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : ǥ\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : ץӥ塼\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : ץӥ塼\n" @@ -324,18 +343,22 @@ "'serial:' ޤ 'usb:')" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "Υɥ饤о" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Υޥ:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Υޥ˥奢:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "ꥢݡȤž®٤Τ߻ꤹ뤳ȤǽǤ" @@ -344,7 +367,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -356,7 +379,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2002 Lutz Mueller Ȥ¾\n" +"Copyright (c) 2000-2004 Lutz Mueller Ȥ¾\n" "%s\n" "gphoto2 ˡΧˤĤ줿ϰϤǴ̵ݾڤǤ\n" "ʤ GNU ͭѵβ gphoto2 ʣۤ뤳ȤǤ" @@ -408,17 +431,19 @@ "ˤޤ󡣤ޤǽ˥եֹƲ" #: gphoto2/gp-params.c:53 -#, fuzzy +#, fuzzy, c-format msgid "*** Error *** \n" msgstr "" "*** 顼 (%i: '%s') *** \n" "\n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -652,6 +677,7 @@ msgstr "gPhoto " #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -828,10 +854,12 @@ msgstr "ե %s ¸ߤޤ񤭤ޤ [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "ե̾ꤷޤ [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "ե̾: " @@ -846,10 +874,12 @@ msgstr "եγǼ: %s%s%s\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "顼: " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -858,10 +888,12 @@ "...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "ߤޤ\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -874,6 +906,7 @@ msgstr " gphoto2 CDK 򥵥ݡȤƤޤ" #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "󥻥뤵ޤ\n" @@ -887,6 +920,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -949,6 +983,7 @@ msgstr "Υɥ饤ФΥޥ˥奢ξ" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -957,6 +992,7 @@ "ꤹɬפޤ() SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -965,10 +1001,12 @@ "ꤹɬפޤ() SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "ˡ:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -982,6 +1020,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1147,22 +1186,27 @@ msgstr "\"%s\" Υإ:" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "ˡ:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr ":" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* [] ΰϥץǤ" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Ѳǽʥޥ:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "ΥޥɤФإפɽ 'help ޥ̾' ϤƲ" diff -Naur gphoto2-2.1.4/po/Makefile.in.in gphoto2/po/Makefile.in.in --- gphoto2-2.1.4/po/Makefile.in.in 2003-10-08 17:30:35.000000000 +0200 +++ gphoto2/po/Makefile.in.in 2004-10-18 16:09:15.679034901 +0200 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2003 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 @@ -7,6 +7,8 @@ # functionality. # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. +# +# Origin: gettext-0.14 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -55,7 +57,7 @@ # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: @echo "$(MSGFMT) -c -o $@ $<"; \ @@ -86,7 +88,7 @@ # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot - test -z "$(CATALOGS)" || $(MAKE) $(CATALOGS) + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @echo "touch stamp-po" @echo timestamp > stamp-poT @mv stamp-poT stamp-po @@ -128,9 +130,13 @@ # Note that a PO file is not touched if it doesn't need to be changed. $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi install: install-exec install-data @@ -310,6 +316,13 @@ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) $(MAKE) update-gmo +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + # General rule for updating PO files. .nop.po-update: diff -Naur gphoto2-2.1.4/po/Makevars gphoto2/po/Makevars --- gphoto2-2.1.4/po/Makevars 2004-01-18 21:01:30.000000000 +0100 +++ gphoto2/po/Makevars 2004-10-18 16:12:06.632982292 +0200 @@ -34,7 +34,7 @@ # 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 = +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. diff -Naur gphoto2-2.1.4/po/Makevars.template gphoto2/po/Makevars.template --- gphoto2-2.1.4/po/Makevars.template 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/Makevars.template 2004-10-18 16:09:15.703031104 +0200 @@ -0,0 +1,41 @@ +# 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 -Naur gphoto2-2.1.4/po/nl.po gphoto2/po/nl.po --- gphoto2-2.1.4/po/nl.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/nl.po 2004-07-26 00:42:47.000000000 +0200 @@ -0,0 +1,1107 @@ +# Dutch translation of gphoto2. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the gphoto2 package. +# Julie Vermeersch , 2004 +# +msgid "" +msgstr "" +"Project-Id-Version: gphoto2 2.1.2\n" +"POT-Creation-Date: 2003-08-10 20:58+0200\n" +"PO-Revision-Date: 2004-08-21 14:31+0100\n" +"Last-Translator: Julie Vermeersch \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "Aantal bestanden in map '%s': %i\n" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "Er zijn geen mappen in map '%s'." + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "Er is één map in map '%s':" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "Er zijn %i mappen in map '%s':" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "Er zijn geen bestanden in map '%s'." + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "Er is één bestand in map '%s':" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "Er zijn %i bestanden in map '%s':" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "Informatie over bestand '%s' (map '%s'):\n" + +#: gphoto2/actions.c:190 +msgid "File:\n" +msgstr "Bestand:\n" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +msgid " None available.\n" +msgstr " Geen beschikbaar.\n" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr " Naam:\t\t'%s'\n" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime-soort:\t'%s'\n" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Grootte:\t%li byte(s)\n" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr " Breedte:\t%i pixel(s)\n" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr " Hoogte:\t%i pixel(s)\n" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Gedownload:\t%s\n" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "yes" +msgstr "ja" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 +msgid "no" +msgstr "nee" + +#: gphoto2/actions.c:208 +msgid " Permissions: " +msgstr " Toelatingen: " + +#: gphoto2/actions.c:211 +msgid "read/delete" +msgstr "lezen/verwijderen" + +#: gphoto2/actions.c:213 +msgid "read" +msgstr "lezen" + +#: gphoto2/actions.c:215 +msgid "delete" +msgstr "verwijderen" + +#: gphoto2/actions.c:217 +msgid "none" +msgstr "geen" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr " Tijd:\t\t%s" + +#: gphoto2/actions.c:224 +msgid "Thumbnail:\n" +msgstr "Miniatuurvoorbeeld:\n" + +#: gphoto2/actions.c:240 +msgid "Audio data:\n" +msgstr "Audiogegevens:\n" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " Mime-soort:\t'%s'\n" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Grootte:\t%li byte(s)\n" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Gedownload: %s\n" + +#: gphoto2/actions.c:380 +msgid "Could not parse EXIF data." +msgstr "Kon EXIF-gegevens niet ontleden" + +#: gphoto2/actions.c:384 +msgid "EXIF tags:" +msgstr "EXIF merktekens:" + +#: gphoto2/actions.c:387 +msgid "Tag" +msgstr "Merkteken" + +#: gphoto2/actions.c:389 +msgid "Value" +msgstr "Waarde" + +#: gphoto2/actions.c:410 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "EXIF-gegevens bevatten een miniatuurvoorbeeld (%i bytes)." + +#: gphoto2/actions.c:419 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "gphoto2 is gecompileerd zonder EXIF-ondersteuning." + +#: gphoto2/actions.c:437 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "Aantal ondersteunde camera's: %i\n" + +#: gphoto2/actions.c:439 +msgid "Supported cameras:\n" +msgstr "Ondersteunde camera's:\n" + +#: gphoto2/actions.c:452 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "\t\"%s\" (AAN HET TESTEN)\n" + +#: gphoto2/actions.c:455 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "\t\"%s\" (EXPERIMENTEEL)\n" + +#: gphoto2/actions.c:460 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t\"%s\"\n" + +#: gphoto2/actions.c:488 +#, c-format +msgid "Devices found: %i\n" +msgstr "Apparaten gevonden: %i\n" + +#: gphoto2/actions.c:489 +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" +"Pad\t\t\t\t Beschrijving\n" +"--------------------------------------------------------------\n" + +#: gphoto2/actions.c:528 gphoto2/actions.c:533 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:528 +msgid "Model" +msgstr "Model" + +#: gphoto2/actions.c:528 +msgid "Port" +msgstr "Poort" + +#: gphoto2/actions.c:529 +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:546 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "Mogelijkheden voor camera\t : %s\n" + +#: gphoto2/actions.c:547 +#, c-format +msgid "Serial port support : %s\n" +msgstr "Seriële poort-ondersteuning\t :%s\n" + +#: gphoto2/actions.c:549 +#, c-format +msgid "USB support : %s\n" +msgstr "USB-ondersteuning\t\t : %s\n" + +#: gphoto2/actions.c:552 +msgid "Transfer speeds supported :\n" +msgstr "Overdrachtssnelheid ondersteund\t :\n" + +#: gphoto2/actions.c:554 +#, c-format +msgid " : %i\n" +msgstr " : %i\n" + +#: gphoto2/actions.c:557 +msgid "Capture choices :\n" +msgstr "Vastleggingskeuzes\t\t :\n" + +#: gphoto2/actions.c:559 +msgid " : Image\n" +msgstr " : Afbeelding\n" + +#: gphoto2/actions.c:561 +msgid " : Video\n" +msgstr " : Video\n" + +#: gphoto2/actions.c:563 +msgid " : Audio\n" +msgstr " : Audio\n" + +#: gphoto2/actions.c:565 +msgid " : Preview\n" +msgstr " : Voorbeeldweergave\n" + +#: gphoto2/actions.c:566 +#, c-format +msgid "Configuration support : %s\n" +msgstr "Configuratie-ondersteuning\t : %s\n" + +#: gphoto2/actions.c:568 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "Bestanden op camera wissen-ondersteuning : %s\n" + +#: gphoto2/actions.c:571 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "Voorbeeldweergave (miniatuur) ondersteuning : %s\n" + +#: gphoto2/actions.c:574 +#, c-format +msgid "File upload support : %s\n" +msgstr "Ondersteuning van bestandsuploaden : %s\n" + +#: gphoto2/actions.c:591 +#, c-format +msgid "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." +msgstr "Poorten moeten eruit zien als 'serial:/dev/ttyS0' of 'usb:', maar '%s' mist een dubbelpunt, dus ik ga gokken wat u bedoelt." + +#: gphoto2/actions.c:630 +#, c-format +msgid "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." +msgstr "De poort die u heeft gespecificeerd ('%s') kan niet worden gevonden. Specificeer één van de poorten gevonden door 'gphoto2 --list-ports' en zorg dat de schrijfwijze juist is (b.v. met voorzetsel 'serial:' of 'usb:')." + +#: gphoto2/actions.c:668 +msgid "About the camera driver:" +msgstr "Over de camerastuurprogramma:" + +#: gphoto2/actions.c:682 +msgid "Camera summary:" +msgstr "Camerasamenvatting:" + +#: gphoto2/actions.c:696 +msgid "Camera manual:" +msgstr "Handleiding van camera:" + +#: gphoto2/actions.c:712 +msgid "You can only specify speeds for serial ports." +msgstr "U kunt enkel snelheden specificeren voor seriële poorten." + +#: gphoto2/actions.c:763 +#, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" +msgstr "" +"gphoto2 %s\n" +"\n" +"Auteursrecht (c) 2000-2003 Lutz Mueller en anderen\n" +"%s\n" +"gphoto2 komt ZONDER GARANTIE, in de mate toegelaten door de wet. U mag \n" +"kopiën van gphoto2 opnieuw ronddelen volgens de voorwaarden van de GNU General \n" +"Public License (Algemene publieke licentie). Voor meer informatie over deze zaken, bekijk de bestanden genaamd COPYING.\n" +"\n" +"Deze versie van gphoto2 gebruikt de volgende programmatuurversies en -opties:\n" + +#: gphoto2/actions.c:776 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "OS/2 poort door Bart van Leeuwen\n" + +#: gphoto2/actions.c:890 +msgid "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" +msgstr "NEEM ALTIJD DE VOLGENDE REGELS OP BIJ HET ZENDEN VAN EEN DEBUG-BERICHT NAAR DE E-MAILLIJST:" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." +msgstr "Slecht bestandsaantal. U heeft %i gespecificeerd, maar er zijn maar %i bestanden beschikbaar in '%s' of zijn onderliggende mappen. Bemachtig eerst een geldig bestandsaantal van een weergave van de bestanden." + +#: gphoto2/foreach.c:283 +#, c-format +msgid "Bad file number. You specified %i, but there is only 1 file available in '%s'." +msgstr "Slecht bestandsaantal. U heeft %i gespecificeerd, maar er is maar één bestandbeschikbaar in '%s'." + +#: gphoto2/foreach.c:291 +#, c-format +msgid "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." +msgstr "Slecht bestandsaantal. U heeft %i gespecificeerd, maar er zijn maar %i bestanden beschikbaarin '%s'. Bemachtig eerst een geldig bestandsaantal van een weergave van de bestanden." + +#: gphoto2/gp-params.c:53 +msgid "*** Error *** \n" +msgstr "*** Fout *** \n" + +#: gphoto2/gp-params.c:220 +msgid "Press any key to continue.\n" +msgstr "Druk op een toets om verder te gaan.\n" + +#: gphoto2/gp-params.c:237 +msgid "Not enough memory." +msgstr "Niet genoeg geheugen." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Actie geannuleerd" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Verdergaan" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Annuleren" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Fout" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Kon de configuratie niet instellen:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Afsluiten" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Terug" + +#: gphoto2/gphoto2-cmd-config.c:253 +msgid "Time: " +msgstr "Tijd: " + +#: gphoto2/gphoto2-cmd-config.c:312 gphoto2/gphoto2-cmd-config.c:340 +#: gphoto2/gphoto2-cmd-config.c:400 gphoto2/gphoto2-cmd-config.c:463 +msgid "Value: " +msgstr "Waarde: " + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "Yes" +msgstr "Ja" + +#: gphoto2/gphoto2-cmd-config.c:362 +msgid "No" +msgstr "Nee" + +#: gphoto2/main.c:161 gphoto2/main.c:1461 +msgid "Turn on debugging" +msgstr "Debuggen inschakelen" + +#: gphoto2/main.c:162 gphoto2/main.c:1463 +msgid "Quiet output (default=verbose)" +msgstr "Stille uitvoer (standaard=veel info geven)" + +#: gphoto2/main.c:166 gphoto2/main.c:1467 +msgid "Display version and exit" +msgstr "Versie weergeven en afsluiten" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Toont dit hulpvenster" + +#: gphoto2/main.c:168 gphoto2/main.c:1469 +msgid "List supported camera models" +msgstr "Lijst van ondersteunde cameramodellen" + +#: gphoto2/main.c:169 gphoto2/main.c:1471 +msgid "List supported port devices" +msgstr "Lijst van ondersteunde poortapparaten" + +#: gphoto2/main.c:170 gphoto2/main.c:1473 +msgid "Send file to stdout" +msgstr "Bestand naar standaard uitvoer sturen" + +#: gphoto2/main.c:171 gphoto2/main.c:1475 +msgid "Print filesize before data" +msgstr "Bestandsgrootte voor gegevens afdrukken" + +#: gphoto2/main.c:172 gphoto2/main.c:1477 +msgid "List auto-detected cameras" +msgstr "Lijst van auto-gedetecteerde camera's" + +#: gphoto2/main.c:175 gphoto2/main.c:1479 +msgid "Specify port device" +msgstr "Specificeer poortapparaat" + +#: gphoto2/main.c:176 gphoto2/main.c:1481 +msgid "Specify serial transfer speed" +msgstr "Specificeer seriële overdrachtssnelheid" + +#: gphoto2/main.c:177 gphoto2/main.c:1483 +msgid "Specify camera model" +msgstr "Specificeer cameramodel" + +#: gphoto2/main.c:178 gphoto2/main.c:1485 +msgid "Specify a filename" +msgstr "Specificeer een bestandsnaam" + +#: gphoto2/main.c:179 gphoto2/main.c:1487 +msgid "(expert only) Override USB IDs" +msgstr "{enkel voor experts} USB-ID's overschrijven" + +#: gphoto2/main.c:182 gphoto2/main.c:1489 +msgid "Display camera abilities" +msgstr "Cameramogelijkheden weergeven" + +#: gphoto2/main.c:183 gphoto2/main.c:1491 +msgid "Specify camera folder (default=\"/\")" +msgstr "Cameramap specificeren (standaard=\"/\")" + +#: gphoto2/main.c:184 gphoto2/main.c:1493 +msgid "Recursion (default for download)" +msgstr "Recursie (standaard voor downloaden)" + +#: gphoto2/main.c:185 gphoto2/main.c:1495 +msgid "No recursion (default for deletion)" +msgstr "Geen recursie (standaard voor verwijdering)" + +#: gphoto2/main.c:186 gphoto2/main.c:1497 +msgid "List folders in folder" +msgstr "Mappen in map weergeven" + +#: gphoto2/main.c:187 gphoto2/main.c:1499 +msgid "List files in folder" +msgstr "Bestanden in map weergeven" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "naam" + +#: gphoto2/main.c:188 gphoto2/main.c:1501 +msgid "Create a directory" +msgstr "Een map aanmaken" + +#: gphoto2/main.c:189 gphoto2/main.c:1503 +msgid "Remove a directory" +msgstr "Een map verwijderen" + +#: gphoto2/main.c:190 gphoto2/main.c:1505 +msgid "Display number of files" +msgstr "Aantal bestanden weergeven" + +#: gphoto2/main.c:191 gphoto2/main.c:1507 +msgid "Get files given in range" +msgstr "Bestanden in gegeven bereik afhalen" + +#: gphoto2/main.c:192 gphoto2/main.c:1509 +msgid "Get all files from folder" +msgstr "Alle bestanden van map afhalen" + +#: gphoto2/main.c:193 gphoto2/main.c:1511 +msgid "Get thumbnails given in range" +msgstr "Miniatuurvoorbeelden in gegeven bereik afhalen" + +#: gphoto2/main.c:194 gphoto2/main.c:1514 +msgid "Get all thumbnails from folder" +msgstr "Alle miniatuurvoorbeelden van map afhalen" + +#: gphoto2/main.c:195 gphoto2/main.c:1517 +msgid "Get raw data given in range" +msgstr "Ruwe gegevens in gegeven bereik afhalen" + +#: gphoto2/main.c:196 gphoto2/main.c:1520 +msgid "Get all raw data from folder" +msgstr "Alle ruwe gegevens van map afhalen" + +#: gphoto2/main.c:197 gphoto2/main.c:1523 +msgid "Get audio data given in range" +msgstr "Audiogegevens in gegeven bereik afhalen" + +#: gphoto2/main.c:198 gphoto2/main.c:1526 +msgid "Get all audio data from folder" +msgstr "Alle audiogegevens van map afhalen" + +#: gphoto2/main.c:199 gphoto2/main.c:1528 +msgid "Delete files given in range" +msgstr "Bestanden in gegeven bereik verwijderen" + +#: gphoto2/main.c:200 gphoto2/main.c:1530 +msgid "Delete all files in folder" +msgstr "Alle bestanden in map verwijderen" + +#: gphoto2/main.c:201 gphoto2/main.c:1532 +msgid "Upload a file to camera" +msgstr "Een bestand uploaden naar camera" + +#: gphoto2/main.c:203 gphoto2/main.c:1535 +msgid "Configure" +msgstr "Configureren" + +#: gphoto2/main.c:205 gphoto2/main.c:1539 +msgid "Capture a quick preview" +msgstr "Een snelle voorbeeldweergave vastlegenn" + +#: gphoto2/main.c:206 gphoto2/main.c:1541 +msgid "Capture an image" +msgstr "Een afbeelding vastleggen" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Een film vastleggen " + +#: gphoto2/main.c:208 gphoto2/main.c:1545 +msgid "Capture an audio clip" +msgstr "Een audio-opname vastleggen" + +#: gphoto2/main.c:210 gphoto2/main.c:1548 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "EXIF-informatie tonen" + +#: gphoto2/main.c:212 gphoto2/main.c:1551 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Informatie tonen" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "Samenvatting van camerastatus" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "Handleiding voor cameraprogrammatuur" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "Over de cameraprogrammatuur" + +#: gphoto2/main.c:216 gphoto2/main.c:1559 +msgid "gPhoto shell" +msgstr "gPhoto shell" + +#: gphoto2/main.c:343 gphoto2/main.c:1192 +msgid "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "Gebruik de volgende tekenreeks a:b=c:d om elk USB-apparaat gedetecteerd als a:b te behandelen als c:d. a b c d moeten hexadecimale nummers zijn beginnend met '0x'.\n" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "Jan" + +#: gphoto2/main.c:466 +msgid "January" +msgstr "Januari" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "Feb" + +#: gphoto2/main.c:467 +msgid "February" +msgstr "Februari" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "Maa" + +#: gphoto2/main.c:468 +msgid "March" +msgstr "Maart" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "Apr" + +#: gphoto2/main.c:469 +msgid "April" +msgstr "April" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "Mei" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "Jun" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "Juni" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "Jul" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "Juli" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "Aug" + +#: gphoto2/main.c:473 +msgid "August" +msgstr "Augustus" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "Sep" + +#: gphoto2/main.c:474 +msgid "September" +msgstr "September" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "Okt" + +#: gphoto2/main.c:475 +msgid "October" +msgstr "Oktober" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "Nov" + +#: gphoto2/main.c:476 +msgid "November" +msgstr "November" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "Dec" + +#: gphoto2/main.c:477 +msgid "December" +msgstr "December" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "Zo" + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "Zondag" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "Ma" + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "Maandag" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "Di" + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "Dinsdag" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "Woe" + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "Woensdag" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "Do" + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "Donderdag" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "Vr" + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "Vrijdag" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "Za" + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "Zaterdag" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "U kunt '%n' niet gebruiken in combinatie met niet-blijvende bestanden!" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "De bestandsnaam aangeboden door de camera ('%s') bevat geen achtervoegsel!" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "Ongeldig formaat '%s' (fout op positie %i)." + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "Bestand %s bestaat. Overschrijven? [y|n]" + +#: gphoto2/main.c:712 +msgid "Specify new filename? [y|n] " +msgstr "Nieuwe bestandsnaam specificeren? [y|n]" + +#: gphoto2/main.c:721 +msgid "Enter new filename: " +msgstr "Geef nieuwe bestandsnaam in: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Bestand aan het opslaan als %s\n" + +#: gphoto2/main.c:918 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "Nieuw bestand is op locatie %s%s%s op de camera\n" + +#: gphoto2/main.c:1050 +msgid "ERROR: " +msgstr "FOUT: " + +#: gphoto2/main.c:1073 +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Aan het afbreken...\n" + +#: gphoto2/main.c:1079 +msgid "Aborted.\n" +msgstr "Afgebroken.\n" + +#: gphoto2/main.c:1084 +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Aan het annuleren...\n" + +#: gphoto2/main.c:1291 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "gphoto2 is gecompileerd zonder ondersteuning voor CDK." + +#: gphoto2/main.c:1404 +msgid "Operation cancelled.\n" +msgstr "Actie geannuleerd.\n" + +#: gphoto2/main.c:1408 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Fout (%i: '%s') *** \n" +"\n" + +#: gphoto2/main.c:1412 +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" +"Voor debugberichten, gebruik de --debug optie.\n" +"Debugberichten kunnen helpen bij het zoeken naar een oplossing voor uw\n" +"probleem. Als u van plan bent om een fout- of debugbericht op te sturen naar\n" +"de gphoto ontwikkelings-maillijst ,\n" +"voer dan alstublijft gphoto uit als volgt:\n" +"\n" + +#: gphoto2/main.c:1465 +msgid "Overwrite files without asking." +msgstr "Bestanden overschrijven zonder te vragen." + +#: gphoto2/main.c:1479 +msgid "path" +msgstr "pad" + +#: gphoto2/main.c:1481 +msgid "speed" +msgstr "snelheid" + +#: gphoto2/main.c:1483 +msgid "model" +msgstr "model" + +#: gphoto2/main.c:1485 +msgid "filename" +msgstr "bestandsnaam" + +#: gphoto2/main.c:1487 +msgid "usbid" +msgstr "usbid" + +#: gphoto2/main.c:1491 +msgid "folder" +msgstr "map" + +#: gphoto2/main.c:1543 +msgid "Capture a movie" +msgstr "Een film vastleggen" + +#: gphoto2/main.c:1553 +msgid "Show summary" +msgstr "Samenvatting tonen" + +#: gphoto2/main.c:1555 +msgid "Show camera driver manual" +msgstr "Handleiding voor cameraprogrammatuur tonen" + +#: gphoto2/main.c:1557 +msgid "About the camera driver manual" +msgstr "Over de handleiding voor de cameraprogrammatuur" + +#: gphoto2/main.c:1784 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "gPhoto2 voor OS/2 vereist dat u de omgevingswaarde CAMLIBS instelt naar de locatie van de camerabibliotheken. b.v. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" + +#: gphoto2/main.c:1794 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "gPhoto2 voor OS/2 vereist dat u de omgevingswaarde IOLIBS instelt naar de locatie van de io-bibliotheken. b.v. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" + +#: gphoto2/options.c:181 +msgid "Usage:\n" +msgstr "Gebruik:\n" + +#: gphoto2/options.c:184 +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" +"Korte/Lange opties (& argument) Beschrijving\n" +"--------------------------------------------------------------------------------\n" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" +msgstr "" +"--------------------------------------------------------------------------------\n" +"[Gebruik dubbele aanhalingstekens rond argumenten]] [Fotonummers beginnen met één (1)]\n" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" +"%s\n" +"Afbeeldings-ID's moeten een getal groter dan nul zijn." + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" +"%s\n" +"Afbeeldings-ID %i te groot." + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" +"%s\n" +"Bereiken moeten worden gescheiden door ','." + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" +"%s\n" +"Bereiken moeten beginnen met een getal." + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" +"%s\n" +"Onverwacht karakter '%c'." + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" +"%s\n" +"Afnemende bereiken zijn niet toegelaten. U kunt een bereik speciferen van %i tot %i." + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Fout (%i: '%s') ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Naar een map op de camera veranderen" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "map" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Naar een map op de lokale schijf veranderen" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "De gPhoto shell afsluiten" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Een bestand downloaden" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[map/]bestandsnaam" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Een miniatuurvoorbeeld downloaden" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Ruwe gegevens downloaden" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Verwijderen" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Toont commandogebruik" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[commando]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "De inhoud van de huidige map tonen" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[map/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "Ongeldig commando." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "Het commando '%s' vereist een argument." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "Ongeldig pad." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "Kon persoonlijke map niet vinden." + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "Kon niet veranderen naar lokale map '%s'." + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "Lokale map is nu '%s'." + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "Map op een andere computer is nu '%s'." + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "Commando '%s' niet gevonden. Gebruik 'help' om een lijst van beschikbare commando's te krijgen." + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "Hulp met \"%s\":" + +#: gphoto2/shell.c:743 +msgid "Usage:" +msgstr "Gebruik:" + +#: gphoto2/shell.c:747 +msgid "Description:" +msgstr "Beschrijving:" + +#: gphoto2/shell.c:749 +msgid "* Arguments in brackets [] are optional" +msgstr "* Argumenten tussen vierkante haken [] zijn optioneel" + +#: gphoto2/shell.c:770 +msgid "Available commands:" +msgstr "Beschikbare commando's:" + +#: gphoto2/shell.c:775 +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "Om hulp te krijgen voor een bepaald commando, typ 'help command-name'." diff -Naur gphoto2-2.1.4/po/no.gmo gphoto2/po/no.gmo --- gphoto2-2.1.4/po/no.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/no.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -4L`adThNoYesProject-Id-Version: gphoto 0.4.3 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2000-04-11 10:12+02:00 -Last-Translator: Kjartan Maraas -Language-Team: Norwegian -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8-bit -NeiJa \ No newline at end of file diff -Naur gphoto2-2.1.4/po/no.po gphoto2/po/no.po --- gphoto2-2.1.4/po/no.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/no.po 2004-03-22 01:01:43.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto 0.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2000-04-11 10:12+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -63,11 +63,12 @@ msgstr "" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -#, fuzzy +#, fuzzy, c-format msgid " None available.\n" msgstr "Ikke tilgjengelig" @@ -115,24 +116,27 @@ msgstr "" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr "" #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "" #: gphoto2/actions.c:213 -#, fuzzy +#, fuzzy, c-format msgid "read" msgstr "Opprett" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "" #: gphoto2/actions.c:217 -#, fuzzy +#, fuzzy, c-format msgid "none" msgstr "Ferdig." @@ -142,10 +146,12 @@ msgstr "" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "" @@ -169,6 +175,7 @@ msgstr "" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "" @@ -195,6 +202,7 @@ msgstr "" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "" @@ -219,6 +227,7 @@ msgstr "" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -239,6 +248,7 @@ msgstr "Port:" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "" @@ -258,6 +268,7 @@ msgstr "" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "" @@ -267,28 +278,32 @@ msgstr "" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr "" #: gphoto2/actions.c:576 -#, fuzzy +#, fuzzy, c-format msgid " : Video\n" msgstr "\t-n vis antall bilder\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr "" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr "" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr "\t-n vis antall bilder\n" @@ -329,22 +344,24 @@ msgstr "" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "" #: gphoto2/actions.c:706 -#, fuzzy +#, fuzzy, c-format msgid "Camera summary:" msgstr "" "%s sammendrag:\n" "%s" #: gphoto2/actions.c:720 -#, fuzzy +#, fuzzy, c-format msgid "Camera manual:" msgstr "Kamera modell:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "" @@ -353,7 +370,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -397,14 +414,17 @@ msgstr "" #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -650,6 +670,7 @@ msgstr "gPhoto melding" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -825,10 +846,12 @@ msgstr "Filen %s eksisterer. Overskriv?" #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "" #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "" @@ -843,21 +866,24 @@ msgstr "" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" msgstr "" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "" #: gphoto2/main.c:1109 -#, fuzzy +#, fuzzy, c-format msgid "" "\n" "Cancelling...\n" @@ -868,7 +894,7 @@ msgstr "" #: gphoto2/main.c:1429 -#, fuzzy +#, fuzzy, c-format msgid "Operation cancelled.\n" msgstr "Nedlasting abrutt." @@ -880,6 +906,7 @@ msgstr "" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -937,22 +964,26 @@ msgstr "Kamera modell:" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" msgstr "" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" msgstr "" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -964,6 +995,7 @@ msgstr "" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1123,21 +1155,26 @@ msgstr "" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" diff -Naur gphoto2-2.1.4/po/pt_BR.gmo gphoto2/po/pt_BR.gmo --- gphoto2-2.1.4/po/pt_BR.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/pt_BR.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,161 +0,0 @@ -= &-)T)~+)#?Th}  Jg0#&'9a!z;  S& =G_~ sNPet##(,GU& )2Obfov&  %>Uo* -!!&C&j     !-!K!d!! !(!!+! " "$","0"5"9">"Y"n"""*""## ####-"#P##S#w##### ####$$1$lQ$$u$9%U%p% %%%%%%%& && &G&&& & ''#&'J'_'|'''''''&'E(W(")$8)"])$)!)#)) ))*A *#M*q*u*}*&*****r+x++ ++-+=+ + ,,*, 1,;,D, K,X,,/l-2------- ---.Z.c/j////&/)/*/4*0)_00 000001 1$1C1`1r1 1 1[1#25'2*]2-22.2*3.3 F3g3;33c4u4 ~4Y4*4 55"65Y5r5v5|555555g6[7a7|7777 777'8!:8&\8K8&8 -839+59'a9%99999!9%9/: L:V:t:::::: ;,;J;)O;y;;;;; ;(;7;0&< W<(a<= =&= =!=">*'>R>+n>&>>(>>+ -?6?H?L?T?X?^?b?h???%?)?/@4@P@T@Z@^@e@ i@&w@@"@@@@%@! A'/AWA[AcAvA#AmAB#B)B+BBC:CWCiCmCtCCCC)CCeD!|DDDD-D E((E!QE/sEEEEE E#E<FKFG=GYGxGGGG G GGGG28HkH oH{H(HHHHHbIhIpI tII8ICI J JJ6J =JGJWJ]JmJJ(K(KKKKKKK -L - LLLy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2002-12-04 -Last-Translator: Evandro Gardenali -Language-Team: Brazilian Portuguese -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8bit - "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTE) - -Abortando... - -Cancelando... - : %i - : udio - : Imagem - : Pr-visualizao - : Vdeo - Obtidos: %s -Obtidos: %s - Altura: %i pixel(s) - Tipo de Mime: '%s' - tipo de mime: '%s' - Nome: '%s' - No disponvel. -Permisses: Tamanho: %li byte(s) - Tamanho %li byte(s) - Hora: %s Largura: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Intervlos decrescentes no so permitidos. Voc especificou um intervalo de %i para %i.%s -ID da imagem %i muito grande.%s -IDs de imagens devem ser um nmero maior que zero.%s -Intervalos devem ser separados por ','.%s -Intervlos precisam comear com um nmero.%s -Caractere inseperado '%c'.forar o uso do IDs USB dado (somente experts)Argumentos nos colchetes [] so optcionais*** Erro (%i: '%s') ****** Erro (%i: '%s') *** - -*** Erro *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use dupla aspas nos argumentos ] [Nmero de imagens comea com um (1)] -Continuar CancelarErro SEMPRE INCLUA AS SEGUINTES LINHAS QUANDO MANDAR UM MENSAGEM DE DEBUG PARA A MAILING LIST Habilidades para a cmera :%s -Abortado. -Sobre o driver da cmeraSobre o manual do driver da cmeraSobre o driver da cmeraAbrAbrilDados de audio: -AgoAgostoCOmandos disponveisRetornarNumero de arquivo errado. Voc especificou %i, mas h somente %i arquivos disponveis'%s' ou suas subpastas. Por favor obtenha um nmero de arquivo vlido do arquivoliste antesNmero de arquivo errado Voc especificou %i, mas h somente %i arquivos disponveis em '%s'.Por favor, primeiro obtenha um nmero de arquivo vlido dalista.Nmero de arquivo errado. Voc especificou %i, mas h somente 1 arquivo disponvel em '%s'.Manual do driver da cmeraManual da CmeraSumrio da cmeraCapturar um vdeoCapturar um vdeoCapturar rpida pr-visualizaoCapturar um clip de udioCapturar uma imagemEscolhas de captura : -Mudar para um diretrio na cmeraMudar para um diretrio no drive localComando '%s' no encontrado. Use 'help' para listar os comandos disponveisSupote a configurao : %s -ConfigurarNo foi possvel mudar para o diretrio local '%s'.No foi possvel encontrar o diretrio homeNo foi possvel analisar os dados EXIFNo foi possvel ajustar configuraoCriar diretrioDezDezembroDeletarApagar todos os arquivos da pastaApagar todos os arquivos do intervaloSuporte a deleo de arquivos na cmera : %s -DescrioDispositivos encontrados: %i -Exibe as habilidades da cmeraExibir nmero de arquivosExibe a verso e saiExibe uso do comandoExibe esta tela de ajudaFazer download de um arquivoFazer download de um thumbnailFazer download de um dado rawERRODados EXIF contm um thumbnail (%i bytes)Etiquetas EXIFDigite um novo nome:SairSair do gPhoto shellFevFevereiroArquivo %s existe. Sobrescrever ? [y|n] Suporte a pr-visualizao do arquivo (thumbnail) : %s -Suporte de upload de arquivos : %s -Arquivo: -Para mensagens de debug, por favor use a opo --debug. -Mensagens de debug podem ajudar a encontrar uma soluo para o seu problema. -Se voc pretende enviar qualquer erro ou mensagem de debug para o gphoto -maling list , por favor execute o gphoto como segue: - -sexsexta-feiraObter todos os dados de udio da pastaObter todos os arquivos da pastaObter todos os dados raw da pastaObter todos os thumbnails da pastaObter todos os dados de udio do intervaloObter arquivos no intervaloObter todos os dados raw dados no intervaloObter todos os thumbnails do intervaloHelp on "%s": Informaa no arquivo '%s'(pasta '%s'): -Comando InvlidoFormato invlido '%s' (erro na posio %i).Caminho invlido.JanJaneiroJulJulhoJunJunhoLista cmeras auto detectadasLista arquivos da pastaLista pastas da pastaLista os modelos de cmera suportadosLista os dispositivos de porta suportadosLista os arquivos e dados do diretrio correnteDiretrio local agora '%s'.MarMaroMaiModelosegsegunda-feiraNovo arquivo est em %s%s%s na cmera -NoNo recurso (padro para deleo)Memria insuficienteNovNovembroNmero de arquivos na pasta '%s': %i -Nmero de Cmeras suportadas: %i -portado para OS/2 por Bart van Leeuwen -OutOutubroOperao CanceladaOperao cancelada. -Sobrescrever arquivos sem perguntarCaminho Descrio --------------------------------------------------------------- -PortaPortas deve parecer-se com 'serial:/dev/ttyS0' ou 'usb:', mas %s et perdendo uma coluna ento eu advinharei o qu voc quer dizerPressione qualquer tecla para continuar. -Exibe o tamanho do arquivo antes do arquivoOutput limpo (padro=verbose)Recurso (padro para download)Diretrio remoto agora '%s'.Remover diretriosabsbadoSalvando arquivo como %s -Evia arquivo para stdoutSetSetembroSuporte porta serial : %s -Pequenas/longas opes (& argument) Descrio --------------------------------------------------------------------------------- -Exibir informao EXIFExibir manual do driver da cmeraExibir informaoMostrar sumrioEspecifica um nome de arquivoEspecifica o diretrio da cmera (padro="/")Especifica modelo de cmeraEspecificar novo nome de arquivo? [y|n] Especifica o dispositivo de portaEspecifica a velocidade de transferncia serialSumrio do status da cmeraDomDomingoCmeras suportadas: -EtiquetasO comando '%s' requer um argumento.O nome do arquivo dado pela cmera ('%s') no contem sufixo!a porta especificada ('%s') no foi encotrada. Por favor especifique uma das portas encontradas pelo gphoto2 --list-ports' e tenha certeza que est escrevendo corretamente (i.e. com prefixo 'serial:' or 'usb:').H %i arquivos na pasta '%s':H %i pastas na pasta '%s':No h arquivos na pasta '%s'.No h pastas na pasta '%s'.H um arquivo na pasta %s'H uma pasta na pasta '%s':quiThumbnail: -quinta-feiraHora: Para obter ajuda em um comando particular digite 'help' nome do comandoVelocidades de transferncias suportadas : -tertera-feiraAtivar modo debugSuporte a USB : %s -Enviar arquivo cmeraUsoUso: -Use a sintaxe a:b=c:d para qualquer dispositivo USB detectado como a:b e c:da b c d deve ser um nmero hex a decimal comeando com '0x'. -ValorValor: quaquarta-feiraSimVoc s pode especificar velocidades para portas seriaisVoc no pode usar '%n' em combinao com arquivos no persistentes[comando][directrio/][diretrio/]nome do arquivoapagardiretrionome do arquivopastaShell do gPhotogPhoto2 para OS/2 requer que voc defina a varivel de ambiente CAMLIBS para o local das bibliotecas da cmera. ex. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 para OS/2 requer que voc defina a varivel de ambiente IOLIBS para o local das bibliotecas da cmera. ex. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 foi compilado sem suporte EXIFgphoto2 foi compilado sem suporte a CDK.modeloNomenonenhumcaminholerler/apagarvelocidadeusbidsim \ No newline at end of file diff -Naur gphoto2-2.1.4/po/pt_BR.po gphoto2/po/pt_BR.po --- gphoto2-2.1.4/po/pt_BR.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/pt_BR.po 2004-03-22 01:01:43.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2002-12-04\n" "Last-Translator: Evandro Gardenali \n" "Language-Team: Brazilian Portuguese \n" @@ -55,10 +55,12 @@ msgstr "Informaa no arquivo '%s'(pasta '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Arquivo:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " No disponvel.\n" @@ -105,22 +107,27 @@ msgstr "no" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr "Permisses: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "ler/apagar" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "ler" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "apagar" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "nenhum" @@ -130,10 +137,12 @@ msgstr " Hora: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Thumbnail:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Dados de audio:\n" @@ -157,6 +166,7 @@ msgstr "No foi possvel analisar os dados EXIF" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "Etiquetas EXIF" @@ -183,6 +193,7 @@ msgstr "Nmero de Cmeras suportadas: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Cmeras suportadas:\n" @@ -207,6 +218,7 @@ msgstr "Dispositivos encontrados: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -228,6 +240,7 @@ msgstr "Porta" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -247,6 +260,7 @@ msgstr "Suporte a USB : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Velocidades de transferncias suportadas :\n" @@ -256,27 +270,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Escolhas de captura :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Imagem\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Vdeo\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : udio\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Pr-visualizao\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Pr-visualizao\n" @@ -322,18 +341,22 @@ "escrevendo corretamente (i.e. com prefixo 'serial:' or 'usb:')." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "Sobre o driver da cmera" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Sumrio da cmera" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Manual da Cmera" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Voc s pode especificar velocidades para portas seriais" @@ -342,7 +365,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -396,14 +419,17 @@ "dalista." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Erro *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Pressione qualquer tecla para continuar.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Memria insuficiente" @@ -637,6 +663,7 @@ msgstr "Shell do gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -813,10 +840,12 @@ msgstr "Arquivo %s existe. Sobrescrever ? [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Especificar novo nome de arquivo? [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Digite um novo nome:" @@ -831,10 +860,12 @@ msgstr "Novo arquivo est em %s%s%s na cmera\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "ERRO" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -843,10 +874,12 @@ "Abortando...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Abortado. \n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -859,6 +892,7 @@ msgstr "gphoto2 foi compilado sem suporte a CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operao cancelada.\n" @@ -872,6 +906,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -933,6 +968,7 @@ msgstr "Sobre o manual do driver da cmera" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -941,6 +977,7 @@ "o local das bibliotecas da cmera. ex. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -949,10 +986,12 @@ "o local das bibliotecas da cmera. ex. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Uso:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -966,6 +1005,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1132,22 +1172,27 @@ msgstr "Help on \"%s\": " #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Uso" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Descrio" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "Argumentos nos colchetes [] so optcionais" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "COmandos disponveis" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Para obter ajuda em um comando particular digite 'help' nome do comando" diff -Naur gphoto2-2.1.4/po/ro.gmo gphoto2/po/ro.gmo --- gphoto2-2.1.4/po/ro.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/ro.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -= -&=)d)+)!3Odx  "J,w0#& *'Iq!;  S&& MWo N`u##(<Ge& )'B_rv& 5Ne* - $(!1&S&z    !!=![!t!! !(!!+! ""0"4"<"@"E"I"N"i"~"""*""###!#'#+#-2#`##c###### ## $$$+$A$la$$u$I%e%% %%%%%%&"& &&&0&W&&& ' '#'#6'Z'o''''''''&'E!(g("%)$H)"m)$)!)#)) ) **A*#]****&*****+++ ++-+=+ , ,%,:, A,K,T, [,h,,o|-/.2/O/U/Z/]/b/g/ l/x/~//h/001 "1 .1/:12j141;122A2T2f22222223 323 N3 [3Ye33A3'!4.I4x4(4/44!5*5;G55&6 66 D6]R6/6 6!6*7&;7b7f7 n7{77777L8N8#,9P9j999"999,:)-:(W:[:/: ;-;"G;j;;;; ;;#;';/< -J<U<'i<<<<<==.=B=+K= w=#=====&=/=/)>Y>=b>??"??"?%@ 7@X@ v@#@@3@A+AAAPATA]AaAgAkA%qAAA%A$A'B GBhBlBsBwB}BB4BB&BBB B( C&2C YCzC~CCC"CyCLDQD'D*E#IE%mE!EEEEE$EF -F/FOFF,F $G2GCG3_G!G'GG&G%!HGHKHTHmH#tH@HH%I(I,J.GJ+vJ-JJ JJJMJ,9KfKjKpK/K"K K -KKL LLLL7L=L *M 4M@MRMYM bMnM wMMNN0HP/yPPPPPPPPPPPy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2-2.1.2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-10-10 12:00-0500 -Last-Translator: Laurentiu Buzdugan -Language-Team: Romanian -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-2 -Content-Transfer-Encoding: 8bit - "%s" - "%s" (EXPERIMENTAL) - "%s" (N TESTARE) - -Renun... - -Renun... - : %i - : Audio - : Imagine - : Previzualizare - : Video - Descrcat: %s - Descrcat: %s -nlime: %i pixel(i) - Tip Mime: '%s' - Cadru Mime: '%s' - Nume: '%s' -Nici unul disponibil. - Permisiuni: Dimens: %li octet(i) -Dimens: %li octet(i) - Timp: %s Lime: %i pixel(i) -%-30s %-16s -%-38s %s -%s -Intervalele descresctoare nu sunt permise. Ai specificat un interval de la %i la %i.%s -ID-ul imaginii %i prea mare.%s -ID-urile imaginilor trebuie s fie numere mai mari dect zero.%s -Intervalele trebuie separate de ','.%s -Intervalele trebuie s nceap cu un numr.%s -Caracter neateptat '%c'.(numai experi) nlocuiete ID-urile USB* Argumente ntre parantezele [] sunt opionale*** Eroare (%i: '%s') ****** Eroare (%i: '%s') *** - -*** Eroare *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Folosii argumente ntre ghilimele duble] [Numrul pozelor ncep cu unu (1)] -ContinuRenunEroareINCLUDEI NTORDEAUNA URMTOARELE LINII CND TRIMITEI MESAJE DE DEPANARE LISTEI DE DISCUII:Capabiliti pentru aparatul foto : %s -Am renunat. -Despre driverului aparatului fotoDespre manualul driverului aparatului fotoDespre driver-ul pentru aparatul foto:AprAprilieData audio: -AugAugustComenzi disponibile:napoiNumr fiiere incorect. Ai specificat %i, dar exist numai %i fiiere n '%s' sau subdirectoarele sale. V rugm obinei un numr de fiiere valid folosind comanda ls.Numr fiiere incorect. Ai specificat %i, dar exist numai %i fiiere n '%s'. V rugm obinei un numr de fiiere valid folosind comanda ls.Numr fiiere incorect. Ai specificat %i, dar exist numai un fiier n '%s'.Manualul driverului aparatului fotoManualul aparatului foto:Rezumat despre aparatul foto:Captureaz un filmCaptureaz un film Captureaz o previzualizare rapidCaptureaz un clip audioCaptureaz o imagineAlegeri captur : -Schimb ntr-un director pe aparatul fotoSchimb ntr-un director pe discul localComanda '%s' nu a fost gsit. Folosii 'help' pentru a vedea lista comenzilor disponibile.Suport configuraie : %s -ConfigureazNu am putut schimba n directorul local '%s'.Nu am putut gsi directorul acas.Nu am putut parsa data EXIF.Nu am putut seta configuraia:Creaz un directorDecDecembrietergeterge toate fiierele din directorterge toate fiierele date n intervalSuport tergere fiiere din aparatul foto : %s -Descriere:Uniti gsite: %i -Afieaza capabilitile aparatului fotoAfieaz numrul de fiiereAfiaz versiunea i terminAfieaz comenzi de folosireAfiaz acest mesaj de ajutorDescarc un fiierDescarc un thumbnailDescarc date 'raw'EROARE: Data EXIF conine un thumbnail (%i octei).Marcaje EXIF:Introducei un nou nume de fiier: IeireIei shell-ul gPhotoFebFebrurieFiierul %s exist. Suprascrie? [d|n] Suport previzualizare (thumbnail) fiier : %s -Suport pentru ncrcarea fiierelor : %s -Fiier: -Pentru mesaje de depanare, v rugm folosii opiunea --debug. -Mesajele de depanare v-ar putea ajuta s gsii o soluie problemei dvs. -Dac intenionai s trimitei orice mesaje de eroare sau depanare listei -de discuii a dezvoltatorilor gphoto , -v rugm rulai gphoto2 astfel: -VinVineriIa toate datele audio din directorIa toate fiierele din directorIa toat datele 'raw' din directorIa toate thumbnail-urile din directorIa datele audio date n intervalIa fiierele date n intervalIa datele 'raw' date n intervalIa thumbnail-urile date n intervalAjutor despre "%s":Informaii despre fiierul '%s' (directorul '%s'): -Comand invalid.Format invalid '%s' (eroare la poziia %i).Cale invalid.IanIanuarieIulIulieIunIunieEnumer aparatele foto auto-detectateEnumer fiierele n directorEnumer directoare n directorEnumer modelele de aparate suportateEnumer porturi de uniti suportateAfieaz coninutul directorului curentDirectorul local este acum '%s'.MarMartieMaiModelLunLuniNoul fiier este n locaia %s%s%s n aparatul foto -NuNe-recursiv (implicit pentru tergere)Memorie insuficient.NoiNoiembrieNumrul de fiiere n director '%s': %i -Numrul aparatelor foto suportate: %i -Portul OS/2 de Bart van Leeuwen -OctOctobrieOperaiune anulatOperaiune anulat. -Suprascrie fiiere fr a ntreba.Cale Descriere --------------------------------------------------------------- -PortPorturile trebuie s arate ceva de genul 'serial:/dev/ttyS0' sau 'usb:', dar lui '%s' l lipsete un ':' aa c vom ncerca s ghicim ce ai intenionat s scriei.Apsai orice tast pentru a continua. -Afieaz dimensiune fiier nainte de dateIeire sumar (implicit=amanunit)Recursiv (implicit pentru descrcare)Directorul remote este acum '%s'.terge un directorSmSmbtSalvez fiierul ca %s -Trimite fiierul la ieirea standardSepSeptembrieSuport pentru portul serial : %s -Opiuni scurte/lungi (& argument) Descriere --------------------------------------------------------------------------------- -Afieaz informaia EXIFAfieaz manualul driverului aparatului fotoAfieaz infoAfieaz rezumatSpecific un nume de fiierSpecific directorul aparatului foto (implicit="/")Specific modelul aparatului fotoSpecific un nou nume de fiier? [y|n] Specific porturi de unitiSpecific viteza de transfer pe serialRezumat despre starea aparatului fotoDumDuminicAparate foto suportate: -MarcajOpiunea `%s' necesit un argument.Numele de fiier dat de aparatul foto (%s') nu conine un sufix!Portul pe care l-ai specificat ('%s') nu poate fi ghichit. V rugm specificai unul dintre porturile gsite folosind comanda 'gphoto2 --list-ports' i asigurai-v c l specificai corect (adic folosind prefixurile 'serial:' sau 'usb:').Exist %i fiiere n directorul '%s':Exist %i directoare n directorul '%s':Nu exist nici un fiier n directorul '%s'.Nu exist nici un director n directorul '%s'.Exist un singur fiier n directorul '%s':Exist un singur director n directorul '%s':JoiThumbnail: -JoiTimp: Pentru a obine ajutor pentru o anumit comand, tastai 'help nume-comand'.Viteze de transport suportate : -MarMariPornii depanareaSuport USB : %s -ncarv un fiier n aparatul fotoFolosire:Folosire: -Folosii urmtoarea sintax a:b=c:d pentru a trata orice dispozitiv USB detectat ca a:b ca c:c in schimb. a b c d trebuie s fie numere hexazecimale ncepnd cu '0x'. -ValoareValoare: MieMiercuriDaPutei specifica viteze numai pentru porturile seriale.Nu putei folosi '%n' n combinaie cu fiiere ne-permanente![comand][director/][director/]fiiertergedirectornume fiierdirectorshell gPhotogPhoto2 pentru OS/2 necesit s setai variabila de mediu CAMLIBS cu locaia bibliotecilor pentru aparatul foto, de exemplu SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 pentru OS/2 necesit s setai variabila de mediu IOLIBS cu locaia bibliotecilor io (intrare/ieire), de exemplu SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller alii -%s -gphoto2 vine FR GARANIE, conform legilor n vigoare. putei -redistribui copii de gphoto2 conform termenilor Licenei Publice Generale -GNU (GNU General Public License). Pentru informaii suplimentare despre -aceste chestiuni consultai fiierele numite COPYING. - -Aceast versiune de gphoto2 folosete urmtoarele versiuni software i opiuni: -gphoto2 a fost compilat fr suport pentru EXIF.gphoto2 a fost compilat fr suport pentru CDK.modelnumenunimiccalecitetecitete/tergevitezidusbda \ No newline at end of file diff -Naur gphoto2-2.1.4/po/ro.po gphoto2/po/ro.po --- gphoto2-2.1.4/po/ro.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/ro.po 2004-03-22 01:01:43.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gphoto2-2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-10-10 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -56,10 +56,12 @@ msgstr "Informaii despre fiierul '%s' (directorul '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Fiier:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr "Nici unul disponibil.\n" @@ -106,22 +108,27 @@ msgstr "nu" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Permisiuni: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "citete/terge" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "citete" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "terge" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "nimic" @@ -131,10 +138,12 @@ msgstr " Timp: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Thumbnail:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Data audio:\n" @@ -158,6 +167,7 @@ msgstr "Nu am putut parsa data EXIF." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "Marcaje EXIF:" @@ -184,6 +194,7 @@ msgstr "Numrul aparatelor foto suportate: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Aparate foto suportate:\n" @@ -208,6 +219,7 @@ msgstr "Uniti gsite: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -229,6 +241,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -248,6 +261,7 @@ msgstr "Suport USB : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Viteze de transport suportate :\n" @@ -257,27 +271,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Alegeri captur :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Imagine\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Audio\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Previzualizare\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Previzualizare\n" @@ -325,18 +344,22 @@ "'serial:' sau 'usb:')." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "Despre driver-ul pentru aparatul foto:" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Rezumat despre aparatul foto:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Manualul aparatului foto:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Putei specifica viteze numai pentru porturile seriale." @@ -345,7 +368,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -357,7 +380,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller alii\n" +"Copyright (c) 2000-2004 Lutz Mueller alii\n" "%s\n" "gphoto2 vine FR GARANIE, conform legilor n vigoare. putei\n" "redistribui copii de gphoto2 conform termenilor Licenei Publice Generale\n" @@ -409,14 +432,17 @@ "s'. V rugm obinei un numr de fiiere valid folosind comanda ls." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Eroare *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Apsai orice tast pentru a continua.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Memorie insuficient." @@ -650,6 +676,7 @@ msgstr "shell gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -827,10 +854,12 @@ msgstr "Fiierul %s exist. Suprascrie? [d|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Specific un nou nume de fiier? [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Introducei un nou nume de fiier: " @@ -845,10 +874,12 @@ msgstr "Noul fiier este n locaia %s%s%s n aparatul foto\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "EROARE: " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -857,10 +888,12 @@ "Renun...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Am renunat.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -873,6 +906,7 @@ msgstr "gphoto2 a fost compilat fr suport pentru CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operaiune anulat.\n" @@ -886,6 +920,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -945,6 +980,7 @@ msgstr "Despre manualul driverului aparatului foto" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -953,6 +989,7 @@ "bibliotecilor pentru aparatul foto, de exemplu SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -961,10 +998,12 @@ "bibliotecilor io (intrare/ieire), de exemplu SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Folosire:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -978,6 +1017,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1145,22 +1185,27 @@ msgstr "Ajutor despre \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Folosire:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Descriere:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Argumente ntre parantezele [] sunt opionale" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Comenzi disponibile:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Pentru a obine ajutor pentru o anumit comand, tastai 'help nume-comand'." diff -Naur gphoto2-2.1.4/po/ru.gmo gphoto2/po/ru.gmo --- gphoto2-2.1.4/po/ru.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/ru.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -4L`ad0h -NoYesProject-Id-Version: gphoto -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2000-05-23 22:02+00:00 -Last-Translator: Valek Filippov -Language-Team: Russian -MIME-Version: 1.0 -Content-Type: text/plain; charset=koi8-r -Content-Transfer-Encoding: 8-bit - \ No newline at end of file diff -Naur gphoto2-2.1.4/po/Rules-quot gphoto2/po/Rules-quot --- gphoto2-2.1.4/po/Rules-quot 2003-10-08 17:30:35.000000000 +0200 +++ gphoto2/po/Rules-quot 2004-10-18 16:09:15.731026674 +0200 @@ -4,6 +4,11 @@ .SUFFIXES: .insert-header .po-update-en +en@quot.po-create: + $(MAKE) en@quot.po-update +en@boldquot.po-create: + $(MAKE) en@boldquot.po-update + en@quot.po-update: en@quot.po-update-en en@boldquot.po-update: en@boldquot.po-update-en diff -Naur gphoto2-2.1.4/po/ru.po gphoto2/po/ru.po --- gphoto2-2.1.4/po/ru.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/ru.po 2004-03-22 01:01:43.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gphoto\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2000-05-23 22:02+00:00\n" "Last-Translator: Valek Filippov \n" "Language-Team: Russian \n" @@ -62,11 +62,12 @@ msgstr "" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -#, fuzzy +#, fuzzy, c-format msgid " None available.\n" msgstr " " @@ -114,24 +115,27 @@ msgstr "" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr "" #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "" #: gphoto2/actions.c:213 -#, fuzzy +#, fuzzy, c-format msgid "read" msgstr "" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "" #: gphoto2/actions.c:217 -#, fuzzy +#, fuzzy, c-format msgid "none" msgstr "." @@ -141,10 +145,12 @@ msgstr "" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "" @@ -168,6 +174,7 @@ msgstr "" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "" @@ -194,6 +201,7 @@ msgstr "" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "" @@ -218,6 +226,7 @@ msgstr "" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -238,6 +247,7 @@ msgstr ":" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "" @@ -257,6 +267,7 @@ msgstr "" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "" @@ -266,28 +277,32 @@ msgstr "" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr "" #: gphoto2/actions.c:576 -#, fuzzy +#, fuzzy, c-format msgid " : Video\n" msgstr "\t-n \n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr "" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr "" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr "\t-n \n" @@ -328,22 +343,24 @@ msgstr "" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "" #: gphoto2/actions.c:706 -#, fuzzy +#, fuzzy, c-format msgid "Camera summary:" msgstr "" "%s :\n" "%s" #: gphoto2/actions.c:720 -#, fuzzy +#, fuzzy, c-format msgid "Camera manual:" msgstr " :" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "" @@ -352,7 +369,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -396,14 +413,17 @@ msgstr "" #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -649,6 +669,7 @@ msgstr " gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -824,10 +845,12 @@ msgstr " %s . ?" #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "" #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "" @@ -842,21 +865,24 @@ msgstr "" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" msgstr "" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "" #: gphoto2/main.c:1109 -#, fuzzy +#, fuzzy, c-format msgid "" "\n" "Cancelling...\n" @@ -867,7 +893,7 @@ msgstr "" #: gphoto2/main.c:1429 -#, fuzzy +#, fuzzy, c-format msgid "Operation cancelled.\n" msgstr " ." @@ -879,6 +905,7 @@ msgstr "" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -936,22 +963,26 @@ msgstr " :" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" msgstr "" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" msgstr "" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -963,6 +994,7 @@ msgstr "" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1122,21 +1154,26 @@ msgstr "" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" diff -Naur gphoto2-2.1.4/po/sk.gmo gphoto2/po/sk.gmo --- gphoto2-2.1.4/po/sk.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/sk.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,182 +0,0 @@ -= -&=)d)+)!3Odx  "J,w0#& *'Iq!;  S&& MWo N`u##(<Ge& )'B_rv& 5Ne* - $(!1&S&z    !!=![!t!! !(!!+! ""0"4"<"@"E"I"N"i"~"""*""###!#'#+#-2#`##c###### ## $$$+$A$la$$u$I%e%% %%%%%%&"& &&&0&W&&& ' '#'#6'Z'o''''''''&'E!(g("%)$H)"m)$)!)#)) ) **A*#]****&*****+++ ++-+=+ , ,%,:, A,K,T, [,h,,o|-/.2/O/U/Z/]/b/g/ l/x/~//d/00 11 -)1&41([1+1*1)122(2B2V2i2%222223 !3 .3F83"3)3&3 34.42M44!44;455 5 5J5&96 -`6k666666666667Q8o888 8 8888! -9,9!K9Hm9%9 9*9!:6:R:m:::: ::2:; ;+;H;^;y;; ;;;;&; -<<%<-<L<P<&X<<;<<<=='=!=%!>"G>$j>>">> >+>+?+G'H)H,H3H&BHiH H -HH,I 4I>IAIHI0LI6}II II I I I IJJJP?K5L8LLM M MMM"M4M=MCMy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (c) 2000-2003 Lutz Mueller and others -%s -gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may -redistribute copies of gphoto2 under the terms of the GNU General Public -License. For more information about these matters, see the files named COPYING. - -This version of gphoto2 is using the following software versions and options: -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2-2.1.2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-10-13 18:51+0200 -Last-Translator: Andrej Kacian -Language-Team: Slovak -MIME-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-2 -Content-Transfer-Encoding: 8bit -X-Generator: KBabel 1.0.2 - "%s" - "%s" (EXPERIMENTLNE) - "%s" (TEST) - -Ukonujem... - -Rum... - : %i - : Zvuk - : Obrzok - : Nhad - : Video - Stiahnut: %s - Stiahnut: %s - Vka: %i pixelov - Mime typ: '%s' - Mime typ: '%s' - Nzov: '%s' - iadne informcie nie s dostupn. - Prstupov prva: Vekos: %li bajtov - Vekos: %li bajtov - as: %s rka: %i pixelov -%-30s %-16s -%-38s %s -%s -Rozsahy musia zana menm slom. Zadali ste rozsah od %i do %i.%s -ID obrzku %i je prli vysok.%s -ID obrzkov musia by vie ako nula.%s -Rozsahy musia by oddelen iarkou.%s -Rozsahy musia zana slom.%s -Neoakvan znak '%c'.(pre pokroilch) Uri USB ID* Parametre v hranatch ztvorkch [] s nepovinn*** Chyba (%i: '%s') ****** Chyba (%i: '%s') *** - -*** Chyba *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Pouite vodzovky pred a za parametrami] [sla obrzkov zanaj slom jedna (1)] -PokraovaStornoChybaPRI ODOSIELAN SPRV O CHYBCH DO MAILINGLISTU VDY PRIPOJTE TIETO RIADKY:Monosti fotoapartu : %s -Ukonen. -O ovldai fotoapartuO ovldai fotoapartuO ovldai zariadenia:AprAprlZvukov data: -AugAugustDostupn prkazy:NaspZl slo sboru. Zadali ste %i, ale v prieinku a jeho podprieinkoch sa nachdza iba %i sborov. Platn slo sboru zistte zo zoznamu sborov prieinku '%s'.Zl slo sboru. Zadali ste %i, ale v prieinku sa nachdza iba %i sborov. Platn slo sboru zistte zo zoznamu sborov v prieinku '%s'.Zl slo sboru. Zadali ste %i, ale v prieinku '%s' sa nachdza iba jeden sborManul ovldaa fotoapartuManul k fotoapartu:Shrn o fotoaparte:Zachyt filmZachyt film Zska rchly nhadZachyt zvukov klipZachyt obrzokSpsoby prce : -Zmen prieinok vo fotoaparteZmen prieinok na loklnom diskuPrkaz '%s nebol njden. Pouite 'help' pre zoznam dostupnch prkazov.Podpora konfigurcie : %s -KonfigurciaNemem zmeni aktulny prieinok na '%s'.Nemem njs domovsk prieinok.Nemem preta data EXIF.Nastavenie sa ned poui:Vytvor prieinokDecDecemberVymaeVymae vetky sbory z prieinkuVymae sbory v danom rozsahuPodpora vymazvania sborov vo fotoaparte : %s -Popis:Poet njdench zariaden: %i -Zobraz monosti fotoapartuZobraz poet sborovZobraz verziu a ukon saZobraz pouitie prkazovZobraz tento textStiahne sborStiahne nhadStiahne ist dataCHYBA: Data EXIF obsahuj nhad (%i bajtov).Tagy EXIF:Zadajte nov nzov: UkoniOpust prkazov riadok gPhotoFebFebrurSbor %s existuje. Prepsa ho? [y/n] Podpora nhadu : %s -Podpora nahrvania sborov do zariadenia : %s -Sbor: -Pre ladiace sprvy pouite vobu --debug. -Ladiace sprvy Vm mu pomc vyriei v problm. -Ak chcete posla chybov alebo ladiace sprvy na mailinglist -vvojrov gphoto , spustite prosm -gphoto2 takto: - -PiPiatokStiahne zvukov data z celho prieinkuStiahne vetky sbory v prieinkuStiahne ist data z celho prieinkuStiahne nhady z celho prieinkuStiahne zvukov data v danom rozsahuStiahne sbory v danom rozsahuStiahne ist data v danom rozsahuStiahne nhady v danom rozsahuPomoc k "%s":Informcie o sbore '%s' (prieinok '%s'): -Neplatn prkaz.Neplatn formt '%s' (chyba na pozcii %i).Neplatn cesta.JanJanurJlJlJnJnVype zoznam njdench fotoapartovVype zoznam sborov v prieinkuZobraz zoznam podprieinkov v prieinkuVype zoznam podporovanch typov fotoapartovVype zoznam podporovanch portovZobraz obsah aktulneho prieinkuLoklny prieinok je teraz '%s'.MarMarecMjModelPoPondelokNov sbor bol uloen na fotoapart ako %s%s%s -NieBez rekurzie (prednastaven pri mazan)Nedostatok pamte.NovNovemberPoet sborov v prieinku '%s': %i -Poet podporovanch fotoapartov: %i -OS/2 port - Bart van Leeuwen -OktOktberOpercia zruenOpercia zruen. -Prepe sbory bez upozorneniaCesta Popis --------------------------------------------------------------- -PortPort mus by v tvare 'serial:/dev/ttyS0' alebo 'usb:', ale v '%s' chba dvojbodka, preto budem hda, o ste mysleli.Stlate klvesu pre pokraovanie. -Pred dtami vype vekos sboruTich vstup (implicitne=detailn)Rekurzia (prednastaven pri sahovan)Vzdialen prieinok je teraz '%s'.Odstrni prieinokSoSobotaUkladm sbor ako %s -Odole sbor na tandardn vstupSepSeptemberPodpora sriovho portu : %s -Krtke/dlh voby (a parametre) Popis --------------------------------------------------------------------------------- -Zobraz informcie EXIFZobraz manul k ovldau fotoapartuZobraz informcieZobraz shrnUr nzov sboruUr prieinok fotoapartu (implicitne "/")Ur typ fotoapartuZada nov nzov? [y/n] Urenie portuUrenie prenosovej rchlosti pri sriovom porteShrn stavu fotoapartuNeNedeaPodporovan fotoaparty: -TagPrkaz '%s' vyaduje parameter.Nzov sboru zskan z fotoapartu ('%s') neobsahuje prponu!Vami zadan port ('%s') nebol njden. Prosm zadajte jeden z portov njdench pomocou prkazu 'gphoto --list-ports' a uistite sa, e ste ho zadali sprvne.%i sborov v prieinku '%s':%i prieinkov v prieinku '%s':V prieinku '%s' nie s iadne sbory.V prieinku '%s' nie s iadne prieinky.V prieinku '%s' je jeden sbor:V prieinku '%s' je jeden prieinok:tNhad: -tvrtokas: Pre pomoc k jednotlivm prkazom napte 'help nzov-prkazu'.Podporovan rchlosti prenosu : -UtUtorokZapn ladeniePodpora USB : %s -Nahr sbor do fotoapartuPouitie:Pouitie: -Pouite syntax a:b=c:d, ak chcete pristupova spsobom c:d k zariadeniu njdenmu ako a:b. a b c d musia by hexadecimlne sla zanajce '0x'. -HodnotaHodnota: StStredanoRchlos mete zada len pri sriovch portoch.Nemete poui '%n' v kombincii s nestlymi sbormi![prkaz][prieinok/][prieinok/]sborvymazanieprieinoknzov sboruprieinokprkazov riadok gPhotogPhoto2 pre OS/2 vyaduje, aby ste nastavili premenn prostredia CAMLIBS na umiestnenie kninc fotoapartov. Napr. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 pre OS/2 vyaduje, aby ste nastavili premenn prostredia IOLIBS na umiestnenie kninc fotoapartov. Napr. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 %s - -Copyright (C) 2000-2003 Lutz Mueller a al -%s -gphoto2 je ren BEZ AKEJKOVEK ZRUKY, v rozsahu povolenom zkonmi. -Kpie gphoto2 s vone riten pod podmienkami Veobecnej verejnej -licencie GNU. alie informcie njdete v sbore nazvanom COPYING. - -Tto verzia gphoto2 pouva nasledovn nastavenia a verzie softwaru: -aplikcia gphoto2 bola skompilovan bez podpory EXIF.aplikcia gphoto2 bola skompilovan bez podpory pre CDK.typnzovnieiadnecestatanietanie/vymazanierchlosusbidno \ No newline at end of file diff -Naur gphoto2-2.1.4/po/sk.po gphoto2/po/sk.po --- gphoto2-2.1.4/po/sk.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/sk.po 2004-03-22 01:01:43.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gphoto2-2.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-10-13 18:51+0200\n" "Last-Translator: Andrej Kacian \n" "Language-Team: Slovak \n" @@ -57,10 +57,12 @@ msgstr "Informcie o sbore '%s' (prieinok '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Sbor:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " iadne informcie nie s dostupn.\n" @@ -107,22 +109,27 @@ msgstr "nie" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Prstupov prva: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "tanie/vymazanie" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "tanie" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "vymazanie" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "iadne" @@ -132,10 +139,12 @@ msgstr " as: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Nhad:\n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Zvukov data:\n" @@ -159,6 +168,7 @@ msgstr "Nemem preta data EXIF." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "Tagy EXIF:" @@ -185,6 +195,7 @@ msgstr "Poet podporovanch fotoapartov: %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Podporovan fotoaparty:\n" @@ -209,6 +220,7 @@ msgstr "Poet njdench zariaden: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -230,6 +242,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -249,6 +262,7 @@ msgstr "Podpora USB : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "Podporovan rchlosti prenosu :\n" @@ -258,27 +272,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Spsoby prce :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Obrzok\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Zvuk\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Nhad\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Nhad\n" @@ -324,18 +343,22 @@ "zadali sprvne." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "O ovldai zariadenia:" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Shrn o fotoaparte:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Manul k fotoapartu:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Rchlos mete zada len pri sriovch portoch." @@ -344,7 +367,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -356,7 +379,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (C) 2000-2003 Lutz Mueller a al\n" +"Copyright (C) 2000-2004 Lutz Mueller a al\n" "%s\n" "gphoto2 je ren BEZ AKEJKOVEK ZRUKY, v rozsahu povolenom zkonmi.\n" "Kpie gphoto2 s vone riten pod podmienkami Veobecnej verejnej\n" @@ -405,14 +428,17 @@ "Platn slo sboru zistte zo zoznamu sborov v prieinku '%s'." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Chyba *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Stlate klvesu pre pokraovanie.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Nedostatok pamte." @@ -646,6 +672,7 @@ msgstr "prkazov riadok gPhoto" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -822,10 +849,12 @@ msgstr "Sbor %s existuje. Prepsa ho? [y/n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Zada nov nzov? [y/n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Zadajte nov nzov: " @@ -840,10 +869,12 @@ msgstr "Nov sbor bol uloen na fotoapart ako %s%s%s\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "CHYBA: " #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -852,10 +883,12 @@ "Ukonujem...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Ukonen.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -868,6 +901,7 @@ msgstr "aplikcia gphoto2 bola skompilovan bez podpory pre CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Opercia zruen.\n" @@ -881,6 +915,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -941,6 +976,7 @@ msgstr "O ovldai fotoapartu" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -949,6 +985,7 @@ "umiestnenie kninc fotoapartov. Napr. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -957,10 +994,12 @@ "umiestnenie kninc fotoapartov. Napr. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Pouitie:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -974,6 +1013,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1139,21 +1179,26 @@ msgstr "Pomoc k \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Pouitie:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Popis:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Parametre v hranatch ztvorkch [] s nepovinn" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Dostupn prkazy:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "Pre pomoc k jednotlivm prkazom napte 'help nzov-prkazu'." diff -Naur gphoto2-2.1.4/po/sl.gmo gphoto2/po/sl.gmo --- gphoto2-2.1.4/po/sl.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/sl.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -4L`adbhNoYesProject-Id-Version: gphoto -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2002-01-04 19:25+0100 -Last-Translator: Andraz Tori -Language-Team: Slovenian -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-2 -Content-Transfer-Encoding: 8bit -NeDa \ No newline at end of file diff -Naur gphoto2-2.1.4/po/sl.po gphoto2/po/sl.po --- gphoto2-2.1.4/po/sl.po 2004-01-18 21:01:45.000000000 +0100 +++ gphoto2/po/sl.po 2004-03-22 01:01:42.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2002-01-04 19:25+0100\n" "Last-Translator: Andraz Tori \n" "Language-Team: Slovenian \n" @@ -63,11 +63,12 @@ msgstr "" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -#, fuzzy +#, fuzzy, c-format msgid " None available.\n" msgstr "Ni na voljo" @@ -115,24 +116,27 @@ msgstr "" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr "" #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "" #: gphoto2/actions.c:213 -#, fuzzy +#, fuzzy, c-format msgid "read" msgstr "Ustvari" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "" #: gphoto2/actions.c:217 -#, fuzzy +#, fuzzy, c-format msgid "none" msgstr "Opravljeno." @@ -142,10 +146,12 @@ msgstr "" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "" @@ -169,6 +175,7 @@ msgstr "" #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "" @@ -195,6 +202,7 @@ msgstr "" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "" @@ -219,6 +227,7 @@ msgstr "" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -239,6 +248,7 @@ msgstr "Vrata:" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "" @@ -258,6 +268,7 @@ msgstr "" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "" @@ -267,28 +278,32 @@ msgstr "" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr "" #: gphoto2/actions.c:576 -#, fuzzy +#, fuzzy, c-format msgid " : Video\n" msgstr "\t-n pokai tevilo slik\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr "" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr "" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr "\t-n pokai tevilo slik\n" @@ -329,22 +344,24 @@ msgstr "" #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "" #: gphoto2/actions.c:706 -#, fuzzy +#, fuzzy, c-format msgid "Camera summary:" msgstr "" "%s povzetek:\n" "%s" #: gphoto2/actions.c:720 -#, fuzzy +#, fuzzy, c-format msgid "Camera manual:" msgstr "Model fotoaparata:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "" @@ -353,7 +370,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -397,14 +414,17 @@ msgstr "" #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -650,6 +670,7 @@ msgstr "gPhoto sporoilo" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -825,10 +846,12 @@ msgstr "Datoteka %s e obstaja prepiem?" #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "" #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "" @@ -843,21 +866,24 @@ msgstr "" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" msgstr "" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "" #: gphoto2/main.c:1109 -#, fuzzy +#, fuzzy, c-format msgid "" "\n" "Cancelling...\n" @@ -868,7 +894,7 @@ msgstr "" #: gphoto2/main.c:1429 -#, fuzzy +#, fuzzy, c-format msgid "Operation cancelled.\n" msgstr "Prenaanje preklicano." @@ -880,6 +906,7 @@ msgstr "" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -937,22 +964,26 @@ msgstr "Model fotoaparata:" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" msgstr "" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" msgstr "" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -964,6 +995,7 @@ msgstr "" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1123,21 +1155,26 @@ msgstr "" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "" #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" diff -Naur gphoto2-2.1.4/po/sr.po gphoto2/po/sr.po --- gphoto2-2.1.4/po/sr.po 1970-01-01 01:00:00.000000000 +0100 +++ gphoto2/po/sr.po 2004-03-22 01:00:22.000000000 +0100 @@ -0,0 +1,1203 @@ +# Serbian translation of `gphoto2'. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the `gphoto2' package. +# Aleksandar Jelenak , 2004. +msgid "" +msgstr "" +"Project-Id-Version: gphoto2 2.1.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" +"PO-Revision-Date: 2004-03-18 00:30-0500\n" +"Last-Translator: Aleksandar Jelenak \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: gphoto2/actions.c:101 +#, c-format +msgid "Number of files in folder '%s': %i\n" +msgstr "Број датотека у директоријуму „%s“: %i\n" + +#: gphoto2/actions.c:122 +#, c-format +msgid "There are no folders in folder '%s'." +msgstr "Ниједан директоријум у „%s“." + +#: gphoto2/actions.c:126 +#, c-format +msgid "There is one folder in folder '%s':" +msgstr "Један директоријум у „%s“:" + +#: gphoto2/actions.c:130 +#, c-format +msgid "There are %i folders in folder '%s':" +msgstr "Има %i директоријума у „%s“:" + +#: gphoto2/actions.c:157 gphoto2/foreach.c:277 +#, c-format +msgid "There are no files in folder '%s'." +msgstr "Нема датотека у директоријуму „%s“." + +#: gphoto2/actions.c:162 +#, c-format +msgid "There is one file in folder '%s':" +msgstr "Једна датотека у директоријуму „%s“:" + +#: gphoto2/actions.c:167 +#, c-format +msgid "There are %i files in folder '%s':" +msgstr "Има %i датотека у директоријуму „%s“:" + +#: gphoto2/actions.c:188 +#, c-format +msgid "Information on file '%s' (folder '%s'):\n" +msgstr "Подаци о датотеци „%s“ (директоријум „%s“):\n" + +#: gphoto2/actions.c:190 +#, c-format +msgid "File:\n" +msgstr "Датотека:\n" + +#: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format +msgid " None available.\n" +msgstr " Ниједан доступан.\n" + +#: gphoto2/actions.c:195 +#, c-format +msgid " Name: '%s'\n" +msgstr " Име: „%s“\n" + +#: gphoto2/actions.c:197 gphoto2/actions.c:229 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " MIME врста: '%s'\n" + +#: gphoto2/actions.c:199 gphoto2/actions.c:231 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Величина: %li бајт(а/ова)\n" + +#: gphoto2/actions.c:201 gphoto2/actions.c:233 +#, c-format +msgid " Width: %i pixel(s)\n" +msgstr " Ширина: %i пиксел(а)\n" + +#: gphoto2/actions.c:203 gphoto2/actions.c:235 +#, c-format +msgid " Height: %i pixel(s)\n" +msgstr " Висина: %i пиксел(а)\n" + +#: gphoto2/actions.c:205 gphoto2/actions.c:237 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Преузето: %s\n" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 +#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 +msgid "yes" +msgstr "да" + +#: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 +#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 +#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 +msgid "no" +msgstr "не" + +#: gphoto2/actions.c:208 +#, c-format +msgid " Permissions: " +msgstr " Дозволе: " + +#: gphoto2/actions.c:211 +#, c-format +msgid "read/delete" +msgstr "читај/бриши" + +#: gphoto2/actions.c:213 +#, c-format +msgid "read" +msgstr "читај" + +#: gphoto2/actions.c:215 +#, c-format +msgid "delete" +msgstr "бриши" + +#: gphoto2/actions.c:217 +#, c-format +msgid "none" +msgstr "ниједан" + +#: gphoto2/actions.c:221 +#, c-format +msgid " Time: %s" +msgstr " Време: %s" + +#: gphoto2/actions.c:224 +#, c-format +msgid "Thumbnail:\n" +msgstr "Сличица:\n" + +#: gphoto2/actions.c:240 +#, c-format +msgid "Audio data:\n" +msgstr "Звучни записи:\n" + +#: gphoto2/actions.c:245 +#, c-format +msgid " Mime type: '%s'\n" +msgstr " MIME врста: „%s“\n" + +#: gphoto2/actions.c:247 +#, c-format +msgid " Size: %li byte(s)\n" +msgstr " Величина: %li бајт(а/ова)\n" + +#: gphoto2/actions.c:249 +#, c-format +msgid " Downloaded: %s\n" +msgstr " Преузето: %s\n" + +#: gphoto2/actions.c:392 +msgid "Could not parse EXIF data." +msgstr "Нисам могао да тумачим EXIF податке." + +#: gphoto2/actions.c:396 +#, c-format +msgid "EXIF tags:" +msgstr "EXIF ознаке:" + +#: gphoto2/actions.c:399 +msgid "Tag" +msgstr "Ознака" + +#: gphoto2/actions.c:401 +msgid "Value" +msgstr "Вредност" + +#: gphoto2/actions.c:422 +#, c-format +msgid "EXIF data contains a thumbnail (%i bytes)." +msgstr "EXIF подаци садрже сличицу (%i бајтова)." + +#: gphoto2/actions.c:431 +msgid "gphoto2 has been compiled without EXIF support." +msgstr "Гфото2 је преведен без EXIF подршке." + +#: gphoto2/actions.c:449 +#, c-format +msgid "Number of supported cameras: %i\n" +msgstr "Број подржаних камера: %i\n" + +#: gphoto2/actions.c:451 +#, c-format +msgid "Supported cameras:\n" +msgstr "Подржане камере:\n" + +#: gphoto2/actions.c:464 +#, c-format +msgid "\t\"%s\" (TESTING)\n" +msgstr "\t„%s“ (ПРОБНО)\n" + +#: gphoto2/actions.c:467 +#, c-format +msgid "\t\"%s\" (EXPERIMENTAL)\n" +msgstr "\t„%s“ (ЕКСПЕРИМЕНТАЛНО)\n" + +#: gphoto2/actions.c:472 +#, c-format +msgid "\t\"%s\"\n" +msgstr "\t„%s“\n" + +#: gphoto2/actions.c:500 +#, c-format +msgid "Devices found: %i\n" +msgstr "Нађених уређаја: %i\n" + +#: gphoto2/actions.c:501 +#, c-format +msgid "" +"Path Description\n" +"--------------------------------------------------------------\n" +msgstr "" +"Путања Опис\n" +"--------------------------------------------------------------\n" + +#: gphoto2/actions.c:540 gphoto2/actions.c:545 +#, c-format +msgid "%-30s %-16s\n" +msgstr "%-30s %-16s\n" + +#: gphoto2/actions.c:540 +msgid "Model" +msgstr "Модел" + +#: gphoto2/actions.c:540 +msgid "Port" +msgstr "Порт" + +#: gphoto2/actions.c:541 +#, c-format +msgid "----------------------------------------------------------\n" +msgstr "----------------------------------------------------------\n" + +#: gphoto2/actions.c:559 +#, c-format +msgid "Abilities for camera : %s\n" +msgstr "Могућности камере : %s\n" + +#: gphoto2/actions.c:560 +#, c-format +msgid "Serial port support : %s\n" +msgstr "Подршка серијског порта : %s\n" + +#: gphoto2/actions.c:562 +#, c-format +msgid "USB support : %s\n" +msgstr "USB подршка : %s\n" + +#: gphoto2/actions.c:565 +#, c-format +msgid "Transfer speeds supported :\n" +msgstr "Подржане брзине преноса :\n" + +#: gphoto2/actions.c:567 +#, c-format +msgid " : %i\n" +msgstr " : %i\n" + +#: gphoto2/actions.c:570 +#, c-format +msgid "Capture choices :\n" +msgstr "Одабир снимања :\n" + +#: gphoto2/actions.c:572 +#, c-format +msgid " : Image\n" +msgstr " : Слика\n" + +#: gphoto2/actions.c:576 +#, c-format +msgid " : Video\n" +msgstr " : Видео\n" + +#: gphoto2/actions.c:580 +#, c-format +msgid " : Audio\n" +msgstr " : Звук\n" + +#: gphoto2/actions.c:584 +#, c-format +msgid " : Preview\n" +msgstr " : Предглед\n" + +#: gphoto2/actions.c:588 +#, fuzzy, c-format +msgid "" +" : Capture not supported by the driver\n" +msgstr " : Предглед\n" + +#: gphoto2/actions.c:590 +#, c-format +msgid "Configuration support : %s\n" +msgstr "Подршка за подешавање : %s\n" + +#: gphoto2/actions.c:592 +#, c-format +msgid "Delete files on camera support : %s\n" +msgstr "Брисање датотека у камери : %s\n" + +#: gphoto2/actions.c:595 +#, c-format +msgid "File preview (thumbnail) support : %s\n" +msgstr "Предглед датотека (сличице) : %s\n" + +#: gphoto2/actions.c:598 +#, c-format +msgid "File upload support : %s\n" +msgstr "Подршка за натовар датотека : %s\n" + +#: gphoto2/actions.c:615 +#, c-format +msgid "" +"Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a " +"colon so I am going to guess what you mean." +msgstr "" +"Портови морају да изгледају као „serial:/dev/ttyS0“ или „usb:“, али „%s“ " +"недостаје двотачка па ћу да нагађам шта сте мислили." + +#: gphoto2/actions.c:654 +#, c-format +msgid "" +"The port you specified ('%s') can not be found. Please specify one of the " +"ports found by 'gphoto2 --list-ports' and make sure the spelling is correct " +"(i.e. with prefix 'serial:' or 'usb:')." +msgstr "" +"Задати порт („%s“) не може бити нађен. Задајте један од портова нађених са " +"„gphoto2 --list-ports“ и побрините се да је редослед слова тачан (нпр. " +"префикс „serial:“ или „usb:“)." + +#: gphoto2/actions.c:692 +#, c-format +msgid "About the camera driver:" +msgstr "О гоничу камере:" + +#: gphoto2/actions.c:706 +#, c-format +msgid "Camera summary:" +msgstr "Сажетак о камери:" + +#: gphoto2/actions.c:720 +#, c-format +msgid "Camera manual:" +msgstr "Упутство за камеру:" + +#: gphoto2/actions.c:736 +#, c-format +msgid "You can only specify speeds for serial ports." +msgstr "Можете задавати само брзине серијских портова." + +#: gphoto2/actions.c:787 +#, fuzzy, c-format +msgid "" +"gphoto2 %s\n" +"\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" +"%s\n" +"gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" +"redistribute copies of gphoto2 under the terms of the GNU General Public\n" +"License. For more information about these matters, see the files named " +"COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and " +"options:\n" +msgstr "" +"Гфото2 (gphoto2) %s\n" +"\n" +"Ауторска права (c) 2000-2003 Lutz Mueller и други\n" +"%s\n" +"Гфото2 долази без ИКАКВЕ ГАРАНЦИЈЕ, колико је то законом допуштено. Можете\n" +"расподељивати примерке Гфото2 под условима ГНУ Опште јавне лиценце. За\n" +"подробније објашњење ових ствари погледајте датотеку „COPYING“.\n" +"\n" +"Ова верзија Гфото2 користи следеће опције и верзије софтвера:\n" + +#: gphoto2/actions.c:800 +msgid "OS/2 port by Bart van Leeuwen\n" +msgstr "OS/2 верзија: Bart van Leeuwen\n" + +#: gphoto2/actions.c:915 +msgid "" +"ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE " +"MAILING LIST:" +msgstr "" +"КАДА ШАЉЕТЕ ПОПРАВЉАЧКЕ ПОРУКЕ ДОПИСНОМ ДРУШТВУ УВЕК УВРСТИТЕ СЛЕДЕЋЕ РЕДОВЕ:" + +#: gphoto2/foreach.c:254 +#, c-format +msgid "" +"Bad file number. You specified %i, but there are only %i files available in " +"'%s' or its subfolders. Please obtain a valid file number from a file " +"listing first." +msgstr "" +"Лош број датотеке. Задали сте %i, а доступно је свега %i датотека у „%s“ или " +"његовим поддиректоријумима. Сазнајте прво тачан број из списка датотека." + +#: gphoto2/foreach.c:283 +#, c-format +msgid "" +"Bad file number. You specified %i, but there is only 1 file available in '%" +"s'." +msgstr "" +"Лош број датотеке. Задали сте %i, а доступна је само 1 датотека у „%s“." + +#: gphoto2/foreach.c:291 +#, c-format +msgid "" +"Bad file number. You specified %i, but there are only %i files available in " +"'%s'.Please obtain a valid file number from a file listing first." +msgstr "" +"Лош број датотеке. Задали сте %i, а доступно је свега %i датотека у „%s“. " +"Сазнајте прво тачан број из списка датотека." + +#: gphoto2/gp-params.c:53 +#, c-format +msgid "*** Error *** \n" +msgstr "*** Грешка *** \n" + +#: gphoto2/gp-params.c:220 +#, c-format +msgid "Press any key to continue.\n" +msgstr "Притиснути било које дугме за наставак.\n" + +#: gphoto2/gp-params.c:237 +#, c-format +msgid "Not enough memory." +msgstr "Недовољно меморије." + +#: gphoto2/gphoto2-cmd-capture.c:201 +msgid "Operation cancelled" +msgstr "Поступак поништен" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Continue" +msgstr "Настави" + +#: gphoto2/gphoto2-cmd-config.c:55 +msgid "Cancel" +msgstr "Поништи" + +#: gphoto2/gphoto2-cmd-config.c:61 +msgid "Error" +msgstr "Грешка" + +#: gphoto2/gphoto2-cmd-config.c:63 +msgid "Could not set configuration:" +msgstr "Нисам могао да поставим подешавање:" + +#: gphoto2/gphoto2-cmd-config.c:107 +msgid "Exit" +msgstr "Излаз" + +#: gphoto2/gphoto2-cmd-config.c:109 +msgid "Back" +msgstr "Натраг" + +#: gphoto2/gphoto2-cmd-config.c:254 +msgid "Time: " +msgstr "Време:" + +#: gphoto2/gphoto2-cmd-config.c:313 gphoto2/gphoto2-cmd-config.c:341 +#: gphoto2/gphoto2-cmd-config.c:401 gphoto2/gphoto2-cmd-config.c:464 +msgid "Value: " +msgstr "Вредност:" + +#: gphoto2/gphoto2-cmd-config.c:363 +msgid "Yes" +msgstr "Да" + +#: gphoto2/gphoto2-cmd-config.c:363 +msgid "No" +msgstr "Не" + +#: gphoto2/main.c:161 gphoto2/main.c:1486 +msgid "Turn on debugging" +msgstr "Укључи откривање грешака" + +#: gphoto2/main.c:162 gphoto2/main.c:1488 +msgid "Quiet output (default=verbose)" +msgstr "Тихи излаз (почетно=опширно)" + +#: gphoto2/main.c:166 gphoto2/main.c:1492 +msgid "Display version and exit" +msgstr "Прикажи верзију и заврши" + +#: gphoto2/main.c:167 +msgid "Displays this help screen" +msgstr "Приказује ово објашњење" + +#: gphoto2/main.c:168 gphoto2/main.c:1494 +msgid "List supported camera models" +msgstr "Наведи моделе подржаних камера" + +#: gphoto2/main.c:169 gphoto2/main.c:1496 +msgid "List supported port devices" +msgstr "Наведи подржане портовне уређаје" + +#: gphoto2/main.c:170 gphoto2/main.c:1498 +msgid "Send file to stdout" +msgstr "Шаљи датотеку на стандардни излаз" + +#: gphoto2/main.c:171 gphoto2/main.c:1500 +msgid "Print filesize before data" +msgstr "Испиши величину датотеке пре података" + +#: gphoto2/main.c:172 gphoto2/main.c:1502 +msgid "List auto-detected cameras" +msgstr "Наведи самонађене камере" + +#: gphoto2/main.c:175 gphoto2/main.c:1504 +msgid "Specify port device" +msgstr "Задај портовни уређај" + +#: gphoto2/main.c:176 gphoto2/main.c:1506 +msgid "Specify serial transfer speed" +msgstr "Задај брзину серијског преноса" + +#: gphoto2/main.c:177 gphoto2/main.c:1508 +msgid "Specify camera model" +msgstr "Задај модел камере" + +#: gphoto2/main.c:178 gphoto2/main.c:1510 +msgid "Specify a filename" +msgstr "Задај име датотеке" + +#: gphoto2/main.c:179 gphoto2/main.c:1512 +msgid "(expert only) Override USB IDs" +msgstr "(само за стручњака) Заобиђи USB ID-ове" + +#: gphoto2/main.c:182 gphoto2/main.c:1514 +msgid "Display camera abilities" +msgstr "Наведи могућности камере" + +#: gphoto2/main.c:183 gphoto2/main.c:1516 +msgid "Specify camera folder (default=\"/\")" +msgstr "Задај директоријум за камеру (почетно=„/“)" + +#: gphoto2/main.c:184 gphoto2/main.c:1518 +msgid "Recursion (default for download)" +msgstr "Рекурзија (подразумевано код преузимања)" + +#: gphoto2/main.c:185 gphoto2/main.c:1520 +msgid "No recursion (default for deletion)" +msgstr "Без рекурзије (подразумевано за брисање)" + +#: gphoto2/main.c:186 gphoto2/main.c:1522 +msgid "List folders in folder" +msgstr "Наброј поддиректоријуме у директоријуму" + +#: gphoto2/main.c:187 gphoto2/main.c:1524 +msgid "List files in folder" +msgstr "Наброј датотеке у директоријуму" + +#: gphoto2/main.c:188 gphoto2/main.c:189 +msgid "name" +msgstr "име" + +#: gphoto2/main.c:188 gphoto2/main.c:1526 +msgid "Create a directory" +msgstr "Направи директоријум" + +#: gphoto2/main.c:189 gphoto2/main.c:1528 +msgid "Remove a directory" +msgstr "Уклони директоријум" + +#: gphoto2/main.c:190 gphoto2/main.c:1530 +msgid "Display number of files" +msgstr "Прикажи број датотека" + +#: gphoto2/main.c:191 gphoto2/main.c:1532 +msgid "Get files given in range" +msgstr "Узми датотеке у датом опсегу" + +#: gphoto2/main.c:192 gphoto2/main.c:1534 +msgid "Get all files from folder" +msgstr "Узми све датотеке из директоријума" + +#: gphoto2/main.c:193 gphoto2/main.c:1536 +msgid "Get thumbnails given in range" +msgstr "Узми сличице у датом опсегу" + +#: gphoto2/main.c:194 gphoto2/main.c:1539 +msgid "Get all thumbnails from folder" +msgstr "Узми све сличице из директоријума" + +#: gphoto2/main.c:195 gphoto2/main.c:1542 +msgid "Get raw data given in range" +msgstr "Узми сирове података у датом опсегу" + +#: gphoto2/main.c:196 gphoto2/main.c:1545 +msgid "Get all raw data from folder" +msgstr "Узми све сирове податке из директоријума" + +#: gphoto2/main.c:197 gphoto2/main.c:1548 +msgid "Get audio data given in range" +msgstr "Узми звучне записе у датом опсегу" + +#: gphoto2/main.c:198 gphoto2/main.c:1551 +msgid "Get all audio data from folder" +msgstr "Узми све звучне записе из директоријума" + +#: gphoto2/main.c:199 gphoto2/main.c:1553 +msgid "Delete files given in range" +msgstr "Избриши датотеке у датом опсегу" + +#: gphoto2/main.c:200 gphoto2/main.c:1555 +msgid "Delete all files in folder" +msgstr "Избриши све датотеке у директоријуму" + +#: gphoto2/main.c:201 gphoto2/main.c:1557 +msgid "Upload a file to camera" +msgstr "Убаци датотеку у камеру" + +#: gphoto2/main.c:203 gphoto2/main.c:1560 +msgid "Configure" +msgstr "Подешавање" + +#: gphoto2/main.c:205 gphoto2/main.c:1564 +msgid "Capture a quick preview" +msgstr "Захвати брзи предглед" + +#: gphoto2/main.c:206 gphoto2/main.c:1566 +msgid "Capture an image" +msgstr "Захвати слику" + +#: gphoto2/main.c:207 +msgid "Capture a movie " +msgstr "Захвати филм" + +#: gphoto2/main.c:208 gphoto2/main.c:1570 +msgid "Capture an audio clip" +msgstr "Захвати звучни одломак" + +#: gphoto2/main.c:210 gphoto2/main.c:1573 gphoto2/shell.c:113 +msgid "Show EXIF information" +msgstr "Прикажи EXIF податке" + +#: gphoto2/main.c:212 gphoto2/main.c:1576 gphoto2/shell.c:109 +msgid "Show info" +msgstr "Прикажи податке" + +#: gphoto2/main.c:213 +msgid "Summary of camera status" +msgstr "Сажетак стања камере" + +#: gphoto2/main.c:214 +msgid "Camera driver manual" +msgstr "Упутство за гонич камере" + +#: gphoto2/main.c:215 +msgid "About the camera driver" +msgstr "О гоничу камере" + +#: gphoto2/main.c:216 gphoto2/main.c:1584 +msgid "gPhoto shell" +msgstr "gPhoto љуске" + +#: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format +msgid "" +"Use the following syntax a:b=c:d to treat any USB device detected as a:b as " +"c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "" +"Користите следећу синтаксу „a:b=c:d“ за преименовање сваког откривеног USB " +"уређајем из „a:b“ у „c:d“. a b c d требају бити хексадецимални бројеви и " +"почињати са „0x“.\n" + +#: gphoto2/main.c:466 +msgid "Jan" +msgstr "јан." + +#: gphoto2/main.c:466 +msgid "January" +msgstr "Јануар" + +#: gphoto2/main.c:467 +msgid "Feb" +msgstr "феб." + +#: gphoto2/main.c:467 +msgid "February" +msgstr "фебруар" + +#: gphoto2/main.c:468 +msgid "Mar" +msgstr "мар." + +#: gphoto2/main.c:468 +msgid "March" +msgstr "март" + +#: gphoto2/main.c:469 +msgid "Apr" +msgstr "апр." + +#: gphoto2/main.c:469 +msgid "April" +msgstr "април" + +#: gphoto2/main.c:470 +msgid "May" +msgstr "мај" + +#: gphoto2/main.c:471 +msgid "Jun" +msgstr "јун" + +#: gphoto2/main.c:471 +msgid "June" +msgstr "јун" + +#: gphoto2/main.c:472 +msgid "Jul" +msgstr "јул" + +#: gphoto2/main.c:472 +msgid "July" +msgstr "јул" + +#: gphoto2/main.c:473 +msgid "Aug" +msgstr "авг." + +#: gphoto2/main.c:473 +msgid "August" +msgstr "август" + +#: gphoto2/main.c:474 +msgid "Sep" +msgstr "сеп." + +#: gphoto2/main.c:474 +msgid "September" +msgstr "септембар" + +#: gphoto2/main.c:475 +msgid "Oct" +msgstr "окт." + +#: gphoto2/main.c:475 +msgid "October" +msgstr "октобар" + +#: gphoto2/main.c:476 +msgid "Nov" +msgstr "нов." + +#: gphoto2/main.c:476 +msgid "November" +msgstr "новембар" + +#: gphoto2/main.c:477 +msgid "Dec" +msgstr "дец." + +#: gphoto2/main.c:477 +msgid "December" +msgstr "децембар" + +#: gphoto2/main.c:484 +msgid "Sun" +msgstr "нед." + +#: gphoto2/main.c:484 +msgid "Sunday" +msgstr "недеља" + +#: gphoto2/main.c:485 +msgid "Mon" +msgstr "пон." + +#: gphoto2/main.c:485 +msgid "Monday" +msgstr "понедељак" + +#: gphoto2/main.c:486 +msgid "Tue" +msgstr "уто." + +#: gphoto2/main.c:486 +msgid "Tuesday" +msgstr "уторак" + +#: gphoto2/main.c:487 +msgid "Wed" +msgstr "сре." + +#: gphoto2/main.c:487 +msgid "Wednesday" +msgstr "среда" + +#: gphoto2/main.c:488 +msgid "Thu" +msgstr "чет." + +#: gphoto2/main.c:488 +msgid "Thursday" +msgstr "четвртак" + +#: gphoto2/main.c:489 +msgid "Fri" +msgstr "пет." + +#: gphoto2/main.c:489 +msgid "Friday" +msgstr "петак" + +#: gphoto2/main.c:490 +msgid "Sat" +msgstr "суб." + +#: gphoto2/main.c:490 +msgid "Saturday" +msgstr "субота" + +#: gphoto2/main.c:552 +#, c-format +msgid "You cannot use '%n' in combination with non-persistent files!" +msgstr "Не можете користити „%n“ заједно са краткотрајним датотекама!" + +#: gphoto2/main.c:575 +#, c-format +msgid "The filename provided by the camera ('%s') does not contain a suffix!" +msgstr "Име датотеке дато од камере („%s“) не садржи наставак!" + +#: gphoto2/main.c:654 +#, c-format +msgid "Invalid format '%s' (error at position %i)." +msgstr "Неважећи облик „%s“ (грешка на месту %i)." + +#: gphoto2/main.c:701 +#, c-format +msgid "File %s exists. Overwrite? [y|n] " +msgstr "Датотека „%s“ постоји. Пребрисати? [y|n] " + +#: gphoto2/main.c:712 +#, c-format +msgid "Specify new filename? [y|n] " +msgstr "Задати ново име? [y|n] " + +#: gphoto2/main.c:721 +#, c-format +msgid "Enter new filename: " +msgstr "Унесите ново име датотеке: " + +#: gphoto2/main.c:726 +#, c-format +msgid "Saving file as %s\n" +msgstr "Снимање датотеке као „%s“\n" + +#: gphoto2/main.c:943 +#, c-format +msgid "New file is in location %s%s%s on the camera\n" +msgstr "Нова датотека је на месту „%s%s%s“ у камери\n" + +#: gphoto2/main.c:1075 +#, c-format +msgid "ERROR: " +msgstr "ГРЕШКА: " + +#: gphoto2/main.c:1098 +#, c-format +msgid "" +"\n" +"Aborting...\n" +msgstr "" +"\n" +"Прекидам...\n" + +#: gphoto2/main.c:1104 +#, c-format +msgid "Aborted.\n" +msgstr "Прекинуто.\n" + +#: gphoto2/main.c:1109 +#, c-format +msgid "" +"\n" +"Cancelling...\n" +msgstr "" +"\n" +"Поништавам...\n" + +#: gphoto2/main.c:1316 +msgid "gphoto2 has been compiled without support for CDK." +msgstr "Гфото2 је преведен без подршке за CDK." + +#: gphoto2/main.c:1429 +#, c-format +msgid "Operation cancelled.\n" +msgstr "Поступак поништен.\n" + +#: gphoto2/main.c:1433 +#, c-format +msgid "" +"*** Error (%i: '%s') *** \n" +"\n" +msgstr "" +"*** Грешка (%i: „%s“) *** \n" +"\n" + +#: gphoto2/main.c:1437 +#, c-format +msgid "" +"For debugging messages, please use the --debug option.\n" +"Debugging messages may help finding a solution to your problem.\n" +"If you intend to send any error or debug messages to the gphoto\n" +"developer mailing list , please run\n" +"gphoto2 as follows:\n" +"\n" +msgstr "" +"Користите опцију „--debug“ за поруке за откривање грешака. Овакве поруке\n" +"могу да помогну при решавању Ваших проблема. Уколико намеравате да пошаљете\n" +"поруку грешака за Гфото развојно дописно друштво ,\n" +"покрените Гфото2 на следећи начин:\n" +"\n" + +#: gphoto2/main.c:1490 +msgid "Overwrite files without asking." +msgstr "Пребриши датотеке без питања." + +#: gphoto2/main.c:1504 +msgid "path" +msgstr "путања" + +#: gphoto2/main.c:1506 +msgid "speed" +msgstr "брзина" + +#: gphoto2/main.c:1508 +msgid "model" +msgstr "модел" + +#: gphoto2/main.c:1510 +msgid "filename" +msgstr "име датотеке" + +#: gphoto2/main.c:1512 +msgid "usbid" +msgstr "usbid" + +#: gphoto2/main.c:1516 +msgid "folder" +msgstr "директоријум" + +#: gphoto2/main.c:1568 +msgid "Capture a movie" +msgstr "Захвати филм" + +#: gphoto2/main.c:1578 +msgid "Show summary" +msgstr "Прикажи сажетак" + +#: gphoto2/main.c:1580 +msgid "Show camera driver manual" +msgstr "Прикажи упутство за гонич камере" + +#: gphoto2/main.c:1582 +msgid "About the camera driver manual" +msgstr "О упутству за гонич камере" + +#: gphoto2/main.c:1809 +#, c-format +msgid "" +"gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " +"location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "" +"Гфото2 за OS/2 захтева да подесите вредност променљиве окружења CAMLIBS на " +"место библиотека за камеру, нпр. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" + +#: gphoto2/main.c:1819 +#, c-format +msgid "" +"gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " +"location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "" +"Гфото2 за OS/2 захтева да подесите вредност промељиве окружења IOLIBS " +"наместо У/И библиотека, нпр. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" + +#: gphoto2/options.c:181 +#, c-format +msgid "Usage:\n" +msgstr "Употреба:\n" + +#: gphoto2/options.c:184 +#, c-format +msgid "" +"Short/long options (& argument) Description\n" +"--------------------------------------------------------------------------------\n" +msgstr "" +"Кратке/дугачке опције (и аргумент) Опис\n" +"--------------------------------------------------------------------------------\n" + +#: gphoto2/options.c:209 +#, c-format +msgid "%-38s %s\n" +msgstr "%-38s %s\n" + +#: gphoto2/options.c:214 +#, c-format +msgid "" +"--------------------------------------------------------------------------------\n" +"[Use double-quotes around arguments] [Picture numbers begin with one " +"(1)]\n" +msgstr "" +"--------------------------------------------------------------------------------\n" +"[Ставите наводнике (\") око аргумената] [Бројање слика почиње од један " +"(1)]\n" + +#: gphoto2/range.c:103 gphoto2/range.c:157 +#, c-format +msgid "" +"%s\n" +"Image IDs must be a number greater than zero." +msgstr "" +"%s\n" +"Идентификација слика мора да буде број већи од нуле." + +#: gphoto2/range.c:109 gphoto2/range.c:163 +#, c-format +msgid "" +"%s\n" +"Image ID %i too high." +msgstr "" +"%s\n" +"Идентификација слике превелика: %i" + +#: gphoto2/range.c:125 +#, c-format +msgid "" +"%s\n" +"Ranges must be separated by ','." +msgstr "" +"%s\n" +"Опсези морају бити раздвојени са „,“." + +#: gphoto2/range.c:139 +#, c-format +msgid "" +"%s\n" +"Ranges need to start with a number." +msgstr "" +"%s\n" +"Опсези треба да започињу бројем." + +#: gphoto2/range.c:179 +#, c-format +msgid "" +"%s\n" +"Unexpected character '%c'." +msgstr "" +"%s\n" +"Неочекивани знак „%c“." + +#: gphoto2/range.c:202 +#, c-format +msgid "" +"%s\n" +"Decreasing ranges are not allowed. You specified a range from %i to %i." +msgstr "" +"%s\n" +"Опадајући опсези нису дозвољени. Задали сте опсег од %i до %i." + +#: gphoto2/shell.c:55 +#, c-format +msgid "*** Error (%i: '%s') ***" +msgstr "*** Грешка (%i: „%s“) ***" + +#: gphoto2/shell.c:98 +msgid "Change to a directory on the camera" +msgstr "Пређи у директоријум на камери" + +#: gphoto2/shell.c:99 gphoto2/shell.c:101 +msgid "directory" +msgstr "директоријум" + +#: gphoto2/shell.c:100 +msgid "Change to a directory on the local drive" +msgstr "Пређи у директоријум на локалном диску" + +#: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 +msgid "Exit the gPhoto shell" +msgstr "Напусти Гфото љуску" + +#: gphoto2/shell.c:103 +msgid "Download a file" +msgstr "Преузми датотеку" + +#: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 +#: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 +msgid "[directory/]filename" +msgstr "[директоријум/]датотека" + +#: gphoto2/shell.c:105 +msgid "Download a thumbnail" +msgstr "Преузми сличицу" + +#: gphoto2/shell.c:107 +msgid "Download raw data" +msgstr "Преузми сирове податке" + +#: gphoto2/shell.c:111 +msgid "Delete" +msgstr "Избриши" + +#: gphoto2/shell.c:116 gphoto2/shell.c:122 +msgid "Displays command usage" +msgstr "Приказује употребу наредби" + +#: gphoto2/shell.c:117 gphoto2/shell.c:122 +msgid "[command]" +msgstr "[наредба]" + +#: gphoto2/shell.c:118 +msgid "List the contents of the current directory" +msgstr "Испиши садржај тренутног директоријума" + +#: gphoto2/shell.c:119 +msgid "[directory/]" +msgstr "[директоријум/]" + +#: gphoto2/shell.c:421 +msgid "Invalid command." +msgstr "Погрешна наредба." + +#: gphoto2/shell.c:430 +#, c-format +msgid "The command '%s' requires an argument." +msgstr "Наредба „%s“ захтева аргумент." + +#: gphoto2/shell.c:483 +msgid "Invalid path." +msgstr "Погрешна путања." + +#: gphoto2/shell.c:529 +msgid "Could not find home directory." +msgstr "Није могао да нађе домаћи директоријум." + +#: gphoto2/shell.c:537 +#, c-format +msgid "Could not change to local directory '%s'." +msgstr "Није могао да пређе у локални директоријум „%s“." + +#: gphoto2/shell.c:540 +#, c-format +msgid "Local directory now '%s'." +msgstr "Локални директоријум сада „%s“." + +#: gphoto2/shell.c:578 +#, c-format +msgid "Remote directory now '%s'." +msgstr "Удаљени директоријум сада „ %s“." + +#: gphoto2/shell.c:734 +#, c-format +msgid "Command '%s' not found. Use 'help' to get a list of available commands." +msgstr "" +"Наредба „%s“ не постоји. Употребите „help“ за списак доступних наредби." + +#: gphoto2/shell.c:741 +#, c-format +msgid "Help on \"%s\":" +msgstr "Објашњење за „%s“:" + +#: gphoto2/shell.c:743 +#, c-format +msgid "Usage:" +msgstr "Употреба:" + +#: gphoto2/shell.c:747 +#, c-format +msgid "Description:" +msgstr "Опис:" + +#: gphoto2/shell.c:749 +#, c-format +msgid "* Arguments in brackets [] are optional" +msgstr "* Аргументи у [] заградама су необавезни" + +#: gphoto2/shell.c:770 +#, c-format +msgid "Available commands:" +msgstr "Доступне наредбе:" + +#: gphoto2/shell.c:775 +#, c-format +msgid "To get help on a particular command, type in 'help command-name'." +msgstr "За објашњење неке наредбе куцајте „help име-наредбе“." diff -Naur gphoto2-2.1.4/po/stamp-po gphoto2/po/stamp-po --- gphoto2-2.1.4/po/stamp-po 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/stamp-po 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -timestamp diff -Naur gphoto2-2.1.4/po/sv.gmo gphoto2/po/sv.gmo --- gphoto2-2.1.4/po/sv.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/sv.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,164 +0,0 @@ -= &-)T)~+)#?Th}  Jg0#&'9a!z;  S& =G_~ sNPet##(,GU& )2Obfov&  %>Uo* -!!&C&j     !-!K!d!! !(!!+! " "$","0"5"9">"Y"n"""*""## ####-"#P##S#w##### ####$$1$lQ$$u$9%U%p% %%%%%%%& && &G&&& & ''#&'J'_'|'''''''&'E(W(")$8)"])$)!)#)) ))*A *#M*q*u*}*&*****r+x++ ++-+=+ + ,,*, 1,;,D, K,X,,/l-2------- ---.F.O/V/m/ }/ /&/(/(/10)D0n000000011.1I1[1 x1 1Z11.2$02&U2|22,22!23;93u34 (4 -54Z@4&4 -444455 -5*5.565N5T56W66 7747 -E7P7o7 -7#7 7*7X7%W8 }8(8888 99"9+929$M9&r9 999999:2:D:_:r:,w: ::::::.:&#;&J;q;9w;<<<<<=&4=[=$y=,=='=>)>?>O>S>[>_>d>h>m>>>>>+>?2?6?;???F?J?$Q?v?$z????? ?# @-@1@9@O@ f@l@@x@*rAAA$AAB)B-B4BFB]B aB&kBBC-C LCVCeC%}CC"CC CD5D9D@DQD#WDG{DD!E"E#E$F(F)HFrF vFFFGF$FFGG&G?G YG eGrGHH#H'H.H41HAfH -H -HHHHHH HHI' J05JfJmJrJvJ|JJ J JJJy Vl?<D;b@nw[+2*Q$XR%hHM'x^SB`zv): .moP6Gs&|T0#,7!qiYfa"4NWAjr_KZk95/CL-38d ~F>gJ](t1{pU}Oe\ -c=u E I "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - -*** Error *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)Not enough memory.NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Press any key to continue. -Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto 0.4.3 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2003-01-08 23:39+0100 -Last-Translator: Stefan Bjrnelund -Language-Team: Swedish -MIME-Version: 1.0 -Content-Type: text/plain; charset=iso-8859-1 -Content-Transfer-Encoding: 8-bit - "%s" - "%s" (EXPERIMENTELL) - "%s" (TESTAR) - -Avbryter... - -Avbryter... - : %i - : Ljud - : Bild - : Frgranskning - : Video - Nerladdad: %s - Nerladdat: %s - Hjd: %i punkt(er) - Mime typ: '%s' - Mime typ: '%s' - Namn: '%s' - Ingen tillgnglig. - Rttigheter: Storlek: %li byte(s) - Storlek: %li byte(s) - Tid: %s Brdd: %i punkt(er) -%-30s %-16s -%-38s %s -%s -Nedtgende intervall r inte tilltna. Du specificerade ett intervall frn %i till %i.%s -Bild ID %i fr hg.%s -Bild IDs mste vara ett tal strre n noll.%s -Intervall mste separeras av ','.%s -Intervall mste starta med ett tal.%s -Ovntat tecken '%c'.(endast expert) vertid USB IDs* Argument inom klamrar [] r ej ndvndiga.*** Fel (%i: '%s') ****** Fel (%i: '%s') *** - -*** Fel *** ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Anvnd dubbel-apostrof omkring argument] [Foto-nummer brjar med ett (1) ] -FortsttAvbrytFelINKLUDERA ALLTID DE FLJANDE RADERNA NR DU SKICKAR AVLUSNINGS MEDELANDEN TILL POSTLISTAN:Frdigheter hos kameran : %s -Avbruten. -Om kameradrivrutinenOm kameradrivrutinens manualOm kameradrivrutinen:AprAprilLjuddata: -AugAugustiTillgngliga kommandon:BaktFelaktigt filnummer. Du specificerade %i, men det fanns bara %i filer tillgngliga i '%s' eller dess underkataloger. Vnligen skaffa ett giltigt filnummer frn en fillista frst.Felaktigt filnummer. Du specificerade %i, men det r bara %i filer tillgngliga i '%s'. Vnligen skaffa ett giltigt filnummer frn en fillista frst.Felaktigt filnummer. Du specificerade %i, men det finns bara 1 fil tillgngligt i '%s'.Kameradrivrutinens manualKameramanual:Kamera sammanfattning:Spela in en filmTa en filmTa en snabb frhandsgranskningTa ett ljud avsnittTa en bildFngst val : -ndra till en katalog i kameran.ndra till en katalog p den lokala diskenKommandot '%s' inte funnet. Anvnd 'help' fr att f en lista av tillgngliga kommandon.Konfigurationsstd :%s -KonfigureraKunde inte byta till lokal katalog '%s'.Kunde inte hitta hemkatalogen.Kunde inte tolka EXIF data.Kunde inte stta konfiguration:Skapa en katalogDecDecemberRaderaRadera alla filer i mappenRadera filer i det givna intervalletRadera filer p kamera std : %s -Beskrivning:Enheter funna: %i -Visa kamera-frdigheterVisa antalet filerVisar version och avslutarVisar kommandoanvndningVisar den hr hjlptextenLadda ner en bildNerladdning av en minibildNerladdning rdataFEL:EXIF data innehller en minibild (%i bytes).EXIF mrken:Skriv in nytt filnamn: AvslutaAvsluta gPhoto skaletFebFebruariFilen %s existerar. Skriva ver? Ja/Nej [y|n] Fil frgranskning (minibild) std: %s -Fil uppladdnings std : %s -Fil: -Fr avlusningsmeddelanden, var vnlig anvnd flaggan --debug. -Avlusningsmeddelanden kan hjlpa till att hitta en lsning till ditt problem. -Om du avser att snda ngra fel eller avlusningsmeddelanden till gphoto- -utvecklarnas postlista , var vnlig och kr -gphoto2 som fljer: -FreFredagHmta all ljuddata frn mappenHmta alla filer frn mappenHmta all rdata frn mappenHmta alla minibilder i mappenHmta ljuddata i det givna intervalletHmta filer givet i intervallHmta rdata i det givna intervalletHmta all minibilder i det givna intervalletHjlp om "%s":Information om filen '%s' (mapp '%s'): -Ogiltigt kommando.Ogiltigt format '%s' (fel i position %i).Ogiltig skvg.JanJanuariJulJuliJunJuniLista autodetekterade kamrorLista filer i mappLista mappar i mappenListar stdja kamera modellerListar stdja port enheterLista innehllet av den nuvarande katalogenLokal katalog r nu '%s'.MarMarsMajModellMnMndagNy fil r i plats %s%s%s p kameran -NejEj rekursion (standard fr radering)Inte tillrckligt med minne.NovNovemberAntal filer i mappen '%s': %i -Antal stdja kamror : %i -OS/2-portering av Bart van Leeuwen -OktOktoberOperationen avbruten.Operationen avbruten. -Skriv ver filer utan att frga.Skvg Beskrivning --------------------------------------------------------------- -PortPortar mste se ut som 'serial:/dev/ttyS0' eller 'usb:', men '%s' saknar ett kolon s jag kommer att gissa vad du menar.Tryck p ngon tangent fr att fortstta. -Skriv filstorlek fre dataTyst utdata (standard=pratig)Rekursion (standard fr nerladdning)Fjrrkatalogen r nu '%s'.Ta bort en katalogLrLrdagSpara fil som %s -Skicka fil till stdoutSepSeptemberSerieportsstd : %s -Korta/lnga flaggor (& argument) Beskrivning --------------------------------------------------------------------------------- -Visa EXIF informationVisa kameradrivrutinens manualVisa infoVisa summeringSpecificera ett filnamnSpecificera kameramapp (standard="/")Specificera kameramodellSpecificera filnamn? Ja/Nej [y|n] Specificera portenhetSpecificera verfringshastighetSammanfattning av kamerastatusSnSndagStdja kameror: -MrkeKommandot '%s' krver ett argument.Filnamnet tillhandahllet av kameran ('%s') innehller inte ett suffix!Den port du specificerade ('%s') kan inte hittas. Var vnlig specificera en av de portar som hittas av 'gphoto2 --list-ports' och frskra dig om att stavningen r korrekt (dvs med prefixet 'serial:' eller 'usb:').Det finns %i filer i mappen '%s':Det finns %i mappar i mappen '%s':Det finns inga filer i mappen '%s'.Det finns inga mappar i mappen '%s'.Det finns en fil i mappen '%s':Det finns en mapp i mappen i mappen '%s':TorMinibild: -TorsdagTid:Fr att f hjlp om ett speciellt kommando, skriv 'help kommando-namn'.verfringshastigheter som stds : -TisTisdagSl p avlusningUSB-std : %s -Ladda upp fil till kameraAnvndning:Anvndning: -Anvnd den fljande syntaxen a:b=c:d fr att behandla en USB denhet detekterad som a:b som c:d istllet. a b c d skall vara hexadecimala tal som brjar med '0x'. -VrdeVrde: OnsOnsdagJaDu kan bara specificera hastigheter fr serieportar.Du kan inte anvnda '%n' i kombination med icke-bestndiga filer![kommando][katalog/][katalog/]filnamnraderakatalogfilnamnmappgPhoto skalgPhoto2 fr OS/2 krver att du stter omgivnings-variabeln CAMLIBS till katalogen med kamera-biblioteken, t.ex. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 fr OS/2 krver att du stter omgivnings-variabeln IOLIBS till katalogen med io-biblioteken, t.ex. SET IOLIBS=C:\GPHOTO2\IOLIBS -gphoto2 har kompilerats utan EXIF std.gphoto2 har blivit kompilerad utan std fr CDK.modellnamnnejingenvglsalsa/raderahastighetusbidja \ No newline at end of file diff -Naur gphoto2-2.1.4/po/sv.po gphoto2/po/sv.po --- gphoto2-2.1.4/po/sv.po 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/sv.po 2004-03-22 01:01:42.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gphoto 0.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2003-01-08 23:39+0100\n" "Last-Translator: Stefan Bjrnelund \n" "Language-Team: Swedish \n" @@ -57,10 +57,12 @@ msgstr "Information om filen '%s' (mapp '%s'):\n" #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "Fil:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " Ingen tillgnglig.\n" @@ -107,22 +109,27 @@ msgstr "nej" #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " Rttigheter: " #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "lsa/radera" #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "lsa" #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "radera" #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "ingen" @@ -132,10 +139,12 @@ msgstr " Tid: %s" #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "Minibild: \n" #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "Ljuddata:\n" @@ -159,6 +168,7 @@ msgstr "Kunde inte tolka EXIF data." #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "EXIF mrken:" @@ -185,6 +195,7 @@ msgstr "Antal stdja kamror : %i\n" #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "Stdja kameror:\n" @@ -209,6 +220,7 @@ msgstr "Enheter funna: %i\n" #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -230,6 +242,7 @@ msgstr "Port" #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -249,6 +262,7 @@ msgstr "USB-std : %s\n" #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "verfringshastigheter som stds : \n" @@ -258,27 +272,32 @@ msgstr " : %i\n" #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "Fngst val :\n" #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " : Bild\n" #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " : Video\n" #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " : Ljud\n" #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " : Frgranskning\n" #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " : Frgranskning\n" @@ -324,18 +343,22 @@ "stavningen r korrekt (dvs med prefixet 'serial:' eller 'usb:')." #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "Om kameradrivrutinen:" #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "Kamera sammanfattning:" #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "Kameramanual:" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "Du kan bara specificera hastigheter fr serieportar." @@ -344,7 +367,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -356,7 +379,7 @@ msgstr "" "gphoto2 %s\n" "\n" -"Copyright (C) 2000-2002 Lutz Mueller och andra\n" +"Copyright (C) 2000-2004 Lutz Mueller och andra\n" "%s\n" "gphoto2 kommer UTAN GARANTI, i den mn lagen s tillter. Du fr\n" "terdistribuera kopior av gphoto2 under villkoren i GNU General Public\n" @@ -408,14 +431,17 @@ "frst." #: gphoto2/gp-params.c:53 +#, c-format msgid "*** Error *** \n" msgstr "*** Fel *** \n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "Tryck p ngon tangent fr att fortstta.\n" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "Inte tillrckligt med minne." @@ -649,6 +675,7 @@ msgstr "gPhoto skal" #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -827,10 +854,12 @@ msgstr "Filen %s existerar. Skriva ver? Ja/Nej [y|n] " #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "Specificera filnamn? Ja/Nej [y|n] " #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "Skriv in nytt filnamn: " @@ -845,10 +874,12 @@ msgstr "Ny fil r i plats %s%s%s p kameran\n" #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "FEL:" #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -857,10 +888,12 @@ "Avbryter...\n" #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "Avbruten.\n" #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -873,6 +906,7 @@ msgstr "gphoto2 har blivit kompilerad utan std fr CDK." #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "Operationen avbruten.\n" @@ -886,6 +920,7 @@ "\n" #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -947,6 +982,7 @@ msgstr "Om kameradrivrutinens manual" #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -955,6 +991,7 @@ "katalogen med kamera-biblioteken, t.ex. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -963,10 +1000,12 @@ "katalogen med io-biblioteken, t.ex. SET IOLIBS=C:\\GPHOTO2\\IOLIBS\n" #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "Anvndning:\n" #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -980,6 +1019,7 @@ msgstr "%-38s %s\n" #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1147,22 +1187,27 @@ msgstr "Hjlp om \"%s\":" #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "Anvndning:" #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "Beskrivning:" #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* Argument inom klamrar [] r ej ndvndiga." #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "Tillgngliga kommandon:" #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "" "Fr att f hjlp om ett speciellt kommando, skriv 'help kommando-namn'." diff -Naur gphoto2-2.1.4/po/uk.gmo gphoto2/po/uk.gmo --- gphoto2-2.1.4/po/uk.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/uk.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -4L`ad9hNoYesProject-Id-Version: gphoto -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2000-06-27 16:33+0200 -Last-Translator: Yuri Syrota -Language-Team: Ukrainian -MIME-Version: 1.0 -Content-Type: text/plain; charset=koi8-u -Content-Transfer-Encoding: 8-bit - \ No newline at end of file diff -Naur gphoto2-2.1.4/po/uk.po gphoto2/po/uk.po --- gphoto2-2.1.4/po/uk.po 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/uk.po 2004-04-20 21:11:40.000000000 +0200 @@ -1,354 +1,327 @@ -# Ukrainian translation of gPhoto. -# Copyright 2000 Free Software Foundation, Inc. -# Yuri Syrota , 2000. +# Ukrainian translation to gphoto2. +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the gphoto2 package. +# Maxim V. Dziumanenko , 2004. # msgid "" msgstr "" -"Project-Id-Version: gphoto\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" -"PO-Revision-Date: 2000-06-27 16:33+0200\n" -"Last-Translator: Yuri Syrota \n" -"Language-Team: Ukrainian \n" +"Project-Id-Version: gphoto2 2.1.2\n" +"POT-Creation-Date: 2003-08-10 20:58+0200\n" +"PO-Revision-Date: 2004-04-16 20:11+0200\n" +"Last-Translator: Maxim V. Dziumanenko \n" +"Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=koi8-u\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #: gphoto2/actions.c:101 -#, fuzzy, c-format +#, c-format msgid "Number of files in folder '%s': %i\n" -msgstr " #%03i" +msgstr "Кількість файлів у теці \"%s\": %i\n" #: gphoto2/actions.c:122 -#, fuzzy, c-format +#, c-format msgid "There are no folders in folder '%s'." -msgstr "" -" צ:\n" -"%s" +msgstr "У теці \"%s\" немає інших тек." #: gphoto2/actions.c:126 -#, fuzzy, c-format +#, c-format msgid "There is one folder in folder '%s':" -msgstr "" -" צ:\n" -"%s" +msgstr "У теці \"%s\" є одна тека:" #: gphoto2/actions.c:130 #, c-format msgid "There are %i folders in folder '%s':" -msgstr "" +msgstr "Є %i тек у теці \"%s\":" #: gphoto2/actions.c:157 gphoto2/foreach.c:277 -#, fuzzy, c-format +#, c-format msgid "There are no files in folder '%s'." -msgstr "" -" צ:\n" -"%s" +msgstr "У теці \"%s\" немає файлів." #: gphoto2/actions.c:162 -#, fuzzy, c-format +#, c-format msgid "There is one file in folder '%s':" -msgstr "" -" צ:\n" -"%s" +msgstr "У теці \"%s\" є однин файл:" #: gphoto2/actions.c:167 #, c-format msgid "There are %i files in folder '%s':" -msgstr "" +msgstr "Є %i тек у теці \"%s\":" #: gphoto2/actions.c:188 #, c-format msgid "Information on file '%s' (folder '%s'):\n" -msgstr "" +msgstr "Інформація про файл \"%s\" (тека \"%s\"):\n" #: gphoto2/actions.c:190 msgid "File:\n" -msgstr "" +msgstr "Файл:\n" #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 -#, fuzzy msgid " None available.\n" -msgstr " " +msgstr " Немає.\n" #: gphoto2/actions.c:195 #, c-format msgid " Name: '%s'\n" -msgstr "" +msgstr " Назва: '%s'\n" #: gphoto2/actions.c:197 gphoto2/actions.c:229 #, c-format msgid " Mime type: '%s'\n" -msgstr "" +msgstr " MIME-тип: '%s'\n" #: gphoto2/actions.c:199 gphoto2/actions.c:231 #, c-format msgid " Size: %li byte(s)\n" -msgstr "" +msgstr " Розмір: %li байт\n" #: gphoto2/actions.c:201 gphoto2/actions.c:233 #, c-format msgid " Width: %i pixel(s)\n" -msgstr "" +msgstr " Ширина: %i точок\n" #: gphoto2/actions.c:203 gphoto2/actions.c:235 #, c-format msgid " Height: %i pixel(s)\n" -msgstr "" +msgstr " Висота: %i точок\n" #: gphoto2/actions.c:205 gphoto2/actions.c:237 -#, fuzzy, c-format +#, c-format msgid " Downloaded: %s\n" -msgstr " ." +msgstr " Завантажено: %s\n" #: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 -#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 -#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 -#, fuzzy +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 msgid "yes" -msgstr "" +msgstr "так" #: gphoto2/actions.c:206 gphoto2/actions.c:238 gphoto2/actions.c:250 -#: gphoto2/actions.c:561 gphoto2/actions.c:563 gphoto2/actions.c:591 -#: gphoto2/actions.c:594 gphoto2/actions.c:597 gphoto2/actions.c:600 +#: gphoto2/actions.c:548 gphoto2/actions.c:550 gphoto2/actions.c:567 +#: gphoto2/actions.c:570 gphoto2/actions.c:573 gphoto2/actions.c:576 msgid "no" -msgstr "" +msgstr "ні" #: gphoto2/actions.c:208 msgid " Permissions: " -msgstr "" +msgstr " Права: " #: gphoto2/actions.c:211 msgid "read/delete" -msgstr "" +msgstr "читання/видалення" #: gphoto2/actions.c:213 -#, fuzzy msgid "read" -msgstr "" +msgstr "читання" #: gphoto2/actions.c:215 msgid "delete" -msgstr "" +msgstr "видалення" #: gphoto2/actions.c:217 -#, fuzzy msgid "none" -msgstr "." +msgstr "немає" #: gphoto2/actions.c:221 #, c-format msgid " Time: %s" -msgstr "" +msgstr " Час: %s" #: gphoto2/actions.c:224 msgid "Thumbnail:\n" -msgstr "" +msgstr "Мініатюра:\n" #: gphoto2/actions.c:240 msgid "Audio data:\n" -msgstr "" +msgstr "Аудіо-дані:\n" #: gphoto2/actions.c:245 #, c-format msgid " Mime type: '%s'\n" -msgstr "" +msgstr " MIME-тип: '%s'\n" #: gphoto2/actions.c:247 #, c-format msgid " Size: %li byte(s)\n" -msgstr "" +msgstr " Розмір: %li байт\n" #: gphoto2/actions.c:249 -#, fuzzy, c-format +#, c-format msgid " Downloaded: %s\n" -msgstr " ." +msgstr " Завантажено: %s\n" -#: gphoto2/actions.c:392 +#: gphoto2/actions.c:380 msgid "Could not parse EXIF data." -msgstr "" +msgstr "Не вдається проаналізувати EXIF дані." -#: gphoto2/actions.c:396 +#: gphoto2/actions.c:384 msgid "EXIF tags:" -msgstr "" +msgstr "EXIF теги:" -#: gphoto2/actions.c:399 +#: gphoto2/actions.c:387 msgid "Tag" -msgstr "" +msgstr "Тег" -#: gphoto2/actions.c:401 +#: gphoto2/actions.c:389 msgid "Value" -msgstr "" +msgstr "Значення" -#: gphoto2/actions.c:422 +#: gphoto2/actions.c:410 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." -msgstr "" +msgstr "EXIF дані містять мініатюру (%i байт)." -#: gphoto2/actions.c:431 +#: gphoto2/actions.c:419 msgid "gphoto2 has been compiled without EXIF support." -msgstr "" +msgstr "gphoto2 скомпільований без підтримки EXIF." -#: gphoto2/actions.c:449 +#: gphoto2/actions.c:437 #, c-format msgid "Number of supported cameras: %i\n" -msgstr "" +msgstr "Кількість підтримуваних камер: %i\n" -#: gphoto2/actions.c:451 +#: gphoto2/actions.c:439 msgid "Supported cameras:\n" -msgstr "" +msgstr "Підтримувані камери:\n" -#: gphoto2/actions.c:464 +#: gphoto2/actions.c:452 #, c-format msgid "\t\"%s\" (TESTING)\n" -msgstr "" +msgstr "\t\"%s\" (ТЕСТОВИЙ)\n" -#: gphoto2/actions.c:467 +#: gphoto2/actions.c:455 #, c-format msgid "\t\"%s\" (EXPERIMENTAL)\n" -msgstr "" +msgstr "\t\"%s\" (ЕКСПЕРИМЕНТАЛЬНИЙ)\n" -#: gphoto2/actions.c:472 +#: gphoto2/actions.c:460 #, c-format msgid "\t\"%s\"\n" -msgstr "" +msgstr "\t\"%s\"\n" -#: gphoto2/actions.c:500 +#: gphoto2/actions.c:488 #, c-format msgid "Devices found: %i\n" -msgstr "" +msgstr "Знайдено пристроїв: %i\n" -#: gphoto2/actions.c:501 +#: gphoto2/actions.c:489 msgid "" "Path Description\n" "--------------------------------------------------------------\n" msgstr "" +"Шлях Опис\n" +"--------------------------------------------------------------\n" -#: gphoto2/actions.c:540 gphoto2/actions.c:545 +#: gphoto2/actions.c:528 gphoto2/actions.c:533 #, c-format msgid "%-30s %-16s\n" -msgstr "" +msgstr "%-30s %-16s\n" -#: gphoto2/actions.c:540 +#: gphoto2/actions.c:528 msgid "Model" -msgstr "" +msgstr "Модель" -#: gphoto2/actions.c:540 -#, fuzzy +#: gphoto2/actions.c:528 msgid "Port" -msgstr ":" +msgstr "Порт" -#: gphoto2/actions.c:541 +#: gphoto2/actions.c:529 msgid "----------------------------------------------------------\n" -msgstr "" +msgstr "----------------------------------------------------------\n" -#: gphoto2/actions.c:559 +#: gphoto2/actions.c:546 #, c-format msgid "Abilities for camera : %s\n" -msgstr "" +msgstr "Можливості фотоапарата : %s\n" -#: gphoto2/actions.c:560 +#: gphoto2/actions.c:547 #, c-format msgid "Serial port support : %s\n" -msgstr "" +msgstr "Підтримка послідовного порта : %s\n" -#: gphoto2/actions.c:562 +#: gphoto2/actions.c:549 #, c-format msgid "USB support : %s\n" -msgstr "" +msgstr "Підтримка USB : %s\n" -#: gphoto2/actions.c:565 +#: gphoto2/actions.c:552 msgid "Transfer speeds supported :\n" -msgstr "" +msgstr "Підтримувані швидкості :\n" -#: gphoto2/actions.c:567 +#: gphoto2/actions.c:554 #, c-format msgid " : %i\n" -msgstr "" +msgstr " : %i\n" -#: gphoto2/actions.c:570 +#: gphoto2/actions.c:557 msgid "Capture choices :\n" -msgstr "" +msgstr "Вибір захоплення :\n" -#: gphoto2/actions.c:572 +#: gphoto2/actions.c:559 msgid " : Image\n" -msgstr "" +msgstr " : Зображення\n" -#: gphoto2/actions.c:576 -#, fuzzy +#: gphoto2/actions.c:561 msgid " : Video\n" -msgstr "\t-n ˦˦ \n" +msgstr " : Відео\n" -#: gphoto2/actions.c:580 +#: gphoto2/actions.c:563 msgid " : Audio\n" -msgstr "" +msgstr " : Звук\n" -#: gphoto2/actions.c:584 +#: gphoto2/actions.c:565 msgid " : Preview\n" -msgstr "" +msgstr " : Перегляд\n" -#: gphoto2/actions.c:588 -#, fuzzy -msgid "" -" : Capture not supported by the driver\n" -msgstr "\t-n ˦˦ \n" - -#: gphoto2/actions.c:590 +#: gphoto2/actions.c:566 #, c-format msgid "Configuration support : %s\n" -msgstr "" +msgstr "Підтримка настройки : %s\n" -#: gphoto2/actions.c:592 +#: gphoto2/actions.c:568 #, c-format msgid "Delete files on camera support : %s\n" -msgstr "" +msgstr "Підтримка видалення файлів : %s\n" -#: gphoto2/actions.c:595 +#: gphoto2/actions.c:571 #, c-format msgid "File preview (thumbnail) support : %s\n" -msgstr "" +msgstr "Підтримка перегляду мініатюр : %s\n" -#: gphoto2/actions.c:598 +#: gphoto2/actions.c:574 #, c-format msgid "File upload support : %s\n" -msgstr "" +msgstr "Підтримка завантаження у апарат : %s\n" -#: gphoto2/actions.c:615 +#: gphoto2/actions.c:591 #, c-format -msgid "" -"Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a " -"colon so I am going to guess what you mean." -msgstr "" +msgid "Ports must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean." +msgstr "Порт повинен мати формат 'serial:/dev/ttyS0' або 'usb:', але у '%s' відсутня двокрапка, тому програма спробує здогадатись, що ви мали на увазі." -#: gphoto2/actions.c:654 +#: gphoto2/actions.c:630 #, c-format -msgid "" -"The port you specified ('%s') can not be found. Please specify one of the " -"ports found by 'gphoto2 --list-ports' and make sure the spelling is correct " -"(i.e. with prefix 'serial:' or 'usb:')." -msgstr "" +msgid "The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:')." +msgstr "Вказаний вами порт ('%s') не знайдено. Вкажіть один з портів з переліку, що виводиться при виконанні 'gphoto2 --list-ports' та перевірте правильність введеного (тобто префікс 'serial:' чи 'usb:')." -#: gphoto2/actions.c:692 +#: gphoto2/actions.c:668 msgid "About the camera driver:" -msgstr "" +msgstr "Про драйвер апарата:" -#: gphoto2/actions.c:706 -#, fuzzy +#: gphoto2/actions.c:682 msgid "Camera summary:" -msgstr "" -" %s:\n" -"%s" +msgstr "Зведення про апарат:" -#: gphoto2/actions.c:720 -#, fuzzy +#: gphoto2/actions.c:696 msgid "Camera manual:" -msgstr " :" +msgstr "Довідка про апарат:" -#: gphoto2/actions.c:736 +#: gphoto2/actions.c:712 msgid "You can only specify speeds for serial ports." -msgstr "" +msgstr "Швидкість можна вказувати лише для послідовних портів." -#: gphoto2/actions.c:787 +#: gphoto2/actions.c:763 #, c-format msgid "" "gphoto2 %s\n" @@ -357,529 +330,516 @@ "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" -"License. For more information about these matters, see the files named " -"COPYING.\n" +"License. For more information about these matters, see the files named COPYING.\n" "\n" -"This version of gphoto2 is using the following software versions and " -"options:\n" +"This version of gphoto2 is using the following software versions and options:\n" msgstr "" +"gphoto2 %s\n" +"\n" +"Авторські права (c) 2000-2003 Lutz Mueller та інші\n" +"%s\n" +"gphoto2 постачається БЕЗ ГАРАНТІЇ, у межах дозволених законом. Ви можете\n" +"розповсюджувати копії gphoto2 на умовах ліцензії GNU General Public\n" +"License. Додаткову інформацію дивіться у файл з назвою COPYING.\n" +"\n" +"This version of gphoto2 is using the following software versions and options:\n" -#: gphoto2/actions.c:800 +#: gphoto2/actions.c:776 msgid "OS/2 port by Bart van Leeuwen\n" -msgstr "" +msgstr "Перенос для OS/2 виконав Bart van Leeuwen\n" -#: gphoto2/actions.c:915 -msgid "" -"ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE " -"MAILING LIST:" -msgstr "" +#: gphoto2/actions.c:890 +msgid "ALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:" +msgstr "ЗАВЖДИ ВКЛЮЧАЙТЕ НАСТУПНІ РЯДКИ ПРИ НАДСИЛАННЯ НАЛАГОДЖУВАЛЬНИХ ПОВІДОМЛЕНЬ У СПИСОК РОЗСИЛКИ:" #: gphoto2/foreach.c:254 #, c-format -msgid "" -"Bad file number. You specified %i, but there are only %i files available in " -"'%s' or its subfolders. Please obtain a valid file number from a file " -"listing first." -msgstr "" +msgid "Bad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first." +msgstr "Неправильна кількість файлів. Ви вказали %i, але доступно лише %i файлів у \"%s\" або її підтеках. Спочатку дізнайтесь правильну кількість файлів з переліку файлів." #: gphoto2/foreach.c:283 #, c-format -msgid "" -"Bad file number. You specified %i, but there is only 1 file available in '%" -"s'." -msgstr "" +msgid "Bad file number. You specified %i, but there is only 1 file available in '%s'." +msgstr "Неправильна кількість файлів. Ви вказали %i, але доступний лише 1 файл у теці \"%s\"" #: gphoto2/foreach.c:291 #, c-format -msgid "" -"Bad file number. You specified %i, but there are only %i files available in " -"'%s'.Please obtain a valid file number from a file listing first." -msgstr "" +msgid "Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first." +msgstr "Неправильна кількість файлів. Ви вказали %i, але доступно лише %i файлів у теці \"%s\". Спочатку дізнайтесь правильну кількість файлів з переліку файлів." #: gphoto2/gp-params.c:53 msgid "*** Error *** \n" -msgstr "" +msgstr "*** Помилка *** \n" #: gphoto2/gp-params.c:220 msgid "Press any key to continue.\n" -msgstr "" +msgstr "Натисніть будь-яку клавішу.\n" #: gphoto2/gp-params.c:237 msgid "Not enough memory." -msgstr "" +msgstr "Недостатньо пам'яті." #: gphoto2/gphoto2-cmd-capture.c:201 -#, fuzzy msgid "Operation cancelled" -msgstr " צͦ." +msgstr "Операція скасована" #: gphoto2/gphoto2-cmd-config.c:55 msgid "Continue" -msgstr "" +msgstr "Продовжити" #: gphoto2/gphoto2-cmd-config.c:55 -#, fuzzy msgid "Cancel" -msgstr "ͦ" +msgstr "Скасувати" #: gphoto2/gphoto2-cmd-config.c:61 msgid "Error" -msgstr "" +msgstr "Помилка" #: gphoto2/gphoto2-cmd-config.c:63 -#, fuzzy msgid "Could not set configuration:" -msgstr "Ʀæ " +msgstr "Не вдається встановити конфігурацію:" #: gphoto2/gphoto2-cmd-config.c:107 msgid "Exit" -msgstr "" +msgstr "Вийти" #: gphoto2/gphoto2-cmd-config.c:109 msgid "Back" -msgstr "" +msgstr "Назад" -#: gphoto2/gphoto2-cmd-config.c:254 -#, fuzzy +#: gphoto2/gphoto2-cmd-config.c:253 msgid "Time: " -msgstr ":" +msgstr "Час: " -#: gphoto2/gphoto2-cmd-config.c:313 gphoto2/gphoto2-cmd-config.c:341 -#: gphoto2/gphoto2-cmd-config.c:401 gphoto2/gphoto2-cmd-config.c:464 +#: gphoto2/gphoto2-cmd-config.c:312 gphoto2/gphoto2-cmd-config.c:340 +#: gphoto2/gphoto2-cmd-config.c:400 gphoto2/gphoto2-cmd-config.c:463 msgid "Value: " -msgstr "" +msgstr "Значення: " -#: gphoto2/gphoto2-cmd-config.c:363 +#: gphoto2/gphoto2-cmd-config.c:362 msgid "Yes" -msgstr "" +msgstr "Так" -#: gphoto2/gphoto2-cmd-config.c:363 +#: gphoto2/gphoto2-cmd-config.c:362 msgid "No" -msgstr "" +msgstr "Ні" -#: gphoto2/main.c:161 gphoto2/main.c:1486 +#: gphoto2/main.c:161 gphoto2/main.c:1461 msgid "Turn on debugging" -msgstr "" +msgstr "Вмикає налагоджувальну інформацію" -#: gphoto2/main.c:162 gphoto2/main.c:1488 +#: gphoto2/main.c:162 gphoto2/main.c:1463 msgid "Quiet output (default=verbose)" -msgstr "" +msgstr "Тихий режим виводу (типово=докладний)" -#: gphoto2/main.c:166 gphoto2/main.c:1492 +#: gphoto2/main.c:166 gphoto2/main.c:1467 msgid "Display version and exit" -msgstr "" +msgstr "Виводить версію та виходить" #: gphoto2/main.c:167 -#, fuzzy msgid "Displays this help screen" -msgstr "\t-h צ \n" +msgstr "Виводить це повідомлення" -#: gphoto2/main.c:168 gphoto2/main.c:1494 +#: gphoto2/main.c:168 gphoto2/main.c:1469 msgid "List supported camera models" -msgstr "" +msgstr "Виводить перелік підтримуваних моделей фотоапаратів" -#: gphoto2/main.c:169 gphoto2/main.c:1496 +#: gphoto2/main.c:169 gphoto2/main.c:1471 msgid "List supported port devices" -msgstr "" +msgstr "Виводить перелік підтримуваних портів пристроїв" -#: gphoto2/main.c:170 gphoto2/main.c:1498 +#: gphoto2/main.c:170 gphoto2/main.c:1473 msgid "Send file to stdout" -msgstr "" +msgstr "Виводити файл у стандартний вивід" -#: gphoto2/main.c:171 gphoto2/main.c:1500 +#: gphoto2/main.c:171 gphoto2/main.c:1475 msgid "Print filesize before data" -msgstr "" +msgstr "Виводити розмір файлу перед даними" -#: gphoto2/main.c:172 gphoto2/main.c:1502 +#: gphoto2/main.c:172 gphoto2/main.c:1477 msgid "List auto-detected cameras" -msgstr "" +msgstr "Виводить перелік автоматично знайдених фотокамер" -#: gphoto2/main.c:175 gphoto2/main.c:1504 +#: gphoto2/main.c:175 gphoto2/main.c:1479 msgid "Specify port device" -msgstr "" +msgstr "Вказує порт пристрою" -#: gphoto2/main.c:176 gphoto2/main.c:1506 +#: gphoto2/main.c:176 gphoto2/main.c:1481 msgid "Specify serial transfer speed" -msgstr "" +msgstr "Вказує швидкість передачі послідовного порта" -#: gphoto2/main.c:177 gphoto2/main.c:1508 -#, fuzzy +#: gphoto2/main.c:177 gphoto2/main.c:1483 msgid "Specify camera model" -msgstr " :" +msgstr "Вказує модель фотоапарата" -#: gphoto2/main.c:178 gphoto2/main.c:1510 +#: gphoto2/main.c:178 gphoto2/main.c:1485 msgid "Specify a filename" -msgstr "" +msgstr "Вказує назву файлу" -#: gphoto2/main.c:179 gphoto2/main.c:1512 +#: gphoto2/main.c:179 gphoto2/main.c:1487 msgid "(expert only) Override USB IDs" -msgstr "" +msgstr "(лише для фахівців) Перевизначає USB ID" -#: gphoto2/main.c:182 gphoto2/main.c:1514 +#: gphoto2/main.c:182 gphoto2/main.c:1489 msgid "Display camera abilities" -msgstr "" +msgstr "Відображає можливості фотоапарату" -#: gphoto2/main.c:183 gphoto2/main.c:1516 +#: gphoto2/main.c:183 gphoto2/main.c:1491 msgid "Specify camera folder (default=\"/\")" -msgstr "" +msgstr "Вказує теку у камері (типово=\"/\")" -#: gphoto2/main.c:184 gphoto2/main.c:1518 -#, fuzzy +#: gphoto2/main.c:184 gphoto2/main.c:1493 msgid "Recursion (default for download)" -msgstr " ." +msgstr "Рекурсія (типово для завантаження)" -#: gphoto2/main.c:185 gphoto2/main.c:1520 +#: gphoto2/main.c:185 gphoto2/main.c:1495 msgid "No recursion (default for deletion)" -msgstr "" +msgstr "Без рекурсії (типово для видалення)" -#: gphoto2/main.c:186 gphoto2/main.c:1522 +#: gphoto2/main.c:186 gphoto2/main.c:1497 msgid "List folders in folder" -msgstr "" +msgstr "Виводить перелік тек у теці" -#: gphoto2/main.c:187 gphoto2/main.c:1524 +#: gphoto2/main.c:187 gphoto2/main.c:1499 msgid "List files in folder" -msgstr "" +msgstr "Виводить перелік файлів у теці" #: gphoto2/main.c:188 gphoto2/main.c:189 msgid "name" -msgstr "" +msgstr "назва" -#: gphoto2/main.c:188 gphoto2/main.c:1526 +#: gphoto2/main.c:188 gphoto2/main.c:1501 msgid "Create a directory" -msgstr "" +msgstr "Створює каталог" -#: gphoto2/main.c:189 gphoto2/main.c:1528 +#: gphoto2/main.c:189 gphoto2/main.c:1503 msgid "Remove a directory" -msgstr "" +msgstr "Видаляє каталог" -#: gphoto2/main.c:190 gphoto2/main.c:1530 -#, fuzzy +#: gphoto2/main.c:190 gphoto2/main.c:1505 msgid "Display number of files" -msgstr " ˦Ԧ " +msgstr "Відображає кількість файлів" -#: gphoto2/main.c:191 gphoto2/main.c:1532 +#: gphoto2/main.c:191 gphoto2/main.c:1507 msgid "Get files given in range" -msgstr "" +msgstr "Отримати файли з вказаного діапазону" -#: gphoto2/main.c:192 gphoto2/main.c:1534 +#: gphoto2/main.c:192 gphoto2/main.c:1509 msgid "Get all files from folder" -msgstr "" +msgstr "Отримати всі файли з теки" -#: gphoto2/main.c:193 gphoto2/main.c:1536 +#: gphoto2/main.c:193 gphoto2/main.c:1511 msgid "Get thumbnails given in range" -msgstr "" +msgstr "Отримати мініатюри з вказаного діапазону" -#: gphoto2/main.c:194 gphoto2/main.c:1539 +#: gphoto2/main.c:194 gphoto2/main.c:1514 msgid "Get all thumbnails from folder" -msgstr "" +msgstr "Отримати всі мініатюри з теки" -#: gphoto2/main.c:195 gphoto2/main.c:1542 +#: gphoto2/main.c:195 gphoto2/main.c:1517 msgid "Get raw data given in range" -msgstr "" +msgstr "Отримати необроблені дані з діапазону" -#: gphoto2/main.c:196 gphoto2/main.c:1545 +#: gphoto2/main.c:196 gphoto2/main.c:1520 msgid "Get all raw data from folder" -msgstr "" +msgstr "Отримати всі необроблені дані з теки" -#: gphoto2/main.c:197 gphoto2/main.c:1548 +#: gphoto2/main.c:197 gphoto2/main.c:1523 msgid "Get audio data given in range" -msgstr "" +msgstr "Отримати аудіо з вказаного діапазону" -#: gphoto2/main.c:198 gphoto2/main.c:1551 +#: gphoto2/main.c:198 gphoto2/main.c:1526 msgid "Get all audio data from folder" -msgstr "" +msgstr "Отримати всі аудіо дані з теки" -#: gphoto2/main.c:199 gphoto2/main.c:1553 +#: gphoto2/main.c:199 gphoto2/main.c:1528 msgid "Delete files given in range" -msgstr "" +msgstr "Видаляє файли у вказаному діапазоні" -#: gphoto2/main.c:200 gphoto2/main.c:1555 +#: gphoto2/main.c:200 gphoto2/main.c:1530 msgid "Delete all files in folder" -msgstr "" +msgstr "Видаляє всі файли з теки" -#: gphoto2/main.c:201 gphoto2/main.c:1557 +#: gphoto2/main.c:201 gphoto2/main.c:1532 msgid "Upload a file to camera" -msgstr "" +msgstr "Завантажує файл у камеру" -#: gphoto2/main.c:203 gphoto2/main.c:1560 -#, fuzzy +#: gphoto2/main.c:203 gphoto2/main.c:1535 msgid "Configure" -msgstr "" +msgstr "Настройка" -#: gphoto2/main.c:205 gphoto2/main.c:1564 +#: gphoto2/main.c:205 gphoto2/main.c:1539 msgid "Capture a quick preview" -msgstr "" +msgstr "Захопити швидкий перегляд" -#: gphoto2/main.c:206 gphoto2/main.c:1566 -#, fuzzy +#: gphoto2/main.c:206 gphoto2/main.c:1541 msgid "Capture an image" -msgstr " " +msgstr "Захопити зображення" #: gphoto2/main.c:207 msgid "Capture a movie " -msgstr "" +msgstr "Захопити відео " -#: gphoto2/main.c:208 gphoto2/main.c:1570 +#: gphoto2/main.c:208 gphoto2/main.c:1545 msgid "Capture an audio clip" -msgstr "" +msgstr "Захопити звуковий фрагмент" -#: gphoto2/main.c:210 gphoto2/main.c:1573 gphoto2/shell.c:113 +#: gphoto2/main.c:210 gphoto2/main.c:1548 gphoto2/shell.c:113 msgid "Show EXIF information" -msgstr "" +msgstr "Виводить EXIF інформацію" -#: gphoto2/main.c:212 gphoto2/main.c:1576 gphoto2/shell.c:109 +#: gphoto2/main.c:212 gphoto2/main.c:1551 gphoto2/shell.c:109 msgid "Show info" -msgstr "" +msgstr "Виводить інформацію" #: gphoto2/main.c:213 msgid "Summary of camera status" -msgstr "" +msgstr "Виводить статус фотоапарату" #: gphoto2/main.c:214 -#, fuzzy msgid "Camera driver manual" -msgstr " :" +msgstr "Довідка з драйвера фотоапарату" #: gphoto2/main.c:215 msgid "About the camera driver" -msgstr "" +msgstr "Про драйвер фотоапарату" -#: gphoto2/main.c:216 gphoto2/main.c:1584 -#, fuzzy +#: gphoto2/main.c:216 gphoto2/main.c:1559 msgid "gPhoto shell" -msgstr "צ gPhoto" +msgstr "gPhoto оболонка" -#: gphoto2/main.c:343 gphoto2/main.c:1217 -msgid "" -"Use the following syntax a:b=c:d to treat any USB device detected as a:b as " -"c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" -msgstr "" +#: gphoto2/main.c:343 gphoto2/main.c:1192 +msgid "Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" +msgstr "Використовуйте наступний синтаксис a:b=c:d, щоб вважати будь-який USB пристрій визначений як a:b пристроєм c:d. a b c d повинні бути шістнадцятковими числами, що починаються з '0x'.\n" #: gphoto2/main.c:466 msgid "Jan" -msgstr "" +msgstr "Січ" #: gphoto2/main.c:466 msgid "January" -msgstr "" +msgstr "Січень" #: gphoto2/main.c:467 msgid "Feb" -msgstr "" +msgstr "Лют" #: gphoto2/main.c:467 msgid "February" -msgstr "" +msgstr "Лютий" #: gphoto2/main.c:468 msgid "Mar" -msgstr "" +msgstr "Бер" #: gphoto2/main.c:468 msgid "March" -msgstr "" +msgstr "Березень" #: gphoto2/main.c:469 msgid "Apr" -msgstr "" +msgstr "Кві" #: gphoto2/main.c:469 msgid "April" -msgstr "" +msgstr "Квітень" #: gphoto2/main.c:470 msgid "May" -msgstr "" +msgstr "Травень" #: gphoto2/main.c:471 msgid "Jun" -msgstr "" +msgstr "Чер" #: gphoto2/main.c:471 msgid "June" -msgstr "" +msgstr "Червень" #: gphoto2/main.c:472 msgid "Jul" -msgstr "" +msgstr "Лип" #: gphoto2/main.c:472 msgid "July" -msgstr "" +msgstr "Липень" #: gphoto2/main.c:473 msgid "Aug" -msgstr "" +msgstr "Сер" #: gphoto2/main.c:473 msgid "August" -msgstr "" +msgstr "Серпень" #: gphoto2/main.c:474 msgid "Sep" -msgstr "" +msgstr "Вер" #: gphoto2/main.c:474 msgid "September" -msgstr "" +msgstr "Вересень" #: gphoto2/main.c:475 msgid "Oct" -msgstr "" +msgstr "Жов" #: gphoto2/main.c:475 msgid "October" -msgstr "" +msgstr "Жовтень" #: gphoto2/main.c:476 -#, fuzzy msgid "Nov" -msgstr "" +msgstr "Лис" #: gphoto2/main.c:476 msgid "November" -msgstr "" +msgstr "Листопад" #: gphoto2/main.c:477 msgid "Dec" -msgstr "" +msgstr "Гру" #: gphoto2/main.c:477 msgid "December" -msgstr "" +msgstr "Грудень" #: gphoto2/main.c:484 msgid "Sun" -msgstr "" +msgstr "Ндл" #: gphoto2/main.c:484 msgid "Sunday" -msgstr "" +msgstr "Неділя" #: gphoto2/main.c:485 msgid "Mon" -msgstr "" +msgstr "Пнд" #: gphoto2/main.c:485 msgid "Monday" -msgstr "" +msgstr "Понеділок" #: gphoto2/main.c:486 msgid "Tue" -msgstr "" +msgstr "Втр" #: gphoto2/main.c:486 msgid "Tuesday" -msgstr "" +msgstr "Вівторок" #: gphoto2/main.c:487 msgid "Wed" -msgstr "" +msgstr "Срд" #: gphoto2/main.c:487 msgid "Wednesday" -msgstr "" +msgstr "Середа" #: gphoto2/main.c:488 msgid "Thu" -msgstr "" +msgstr "Чтв" #: gphoto2/main.c:488 msgid "Thursday" -msgstr "" +msgstr "Четвер" #: gphoto2/main.c:489 msgid "Fri" -msgstr "" +msgstr "Птн" #: gphoto2/main.c:489 msgid "Friday" -msgstr "" +msgstr "П'ятниця" #: gphoto2/main.c:490 msgid "Sat" -msgstr "" +msgstr "Сбт" #: gphoto2/main.c:490 msgid "Saturday" -msgstr "" +msgstr "Субота" #: gphoto2/main.c:552 #, c-format msgid "You cannot use '%n' in combination with non-persistent files!" -msgstr "" +msgstr "Не можна використовувати '%n' у комбінації з не постійними файлами!" #: gphoto2/main.c:575 #, c-format msgid "The filename provided by the camera ('%s') does not contain a suffix!" -msgstr "" +msgstr "Надана фотоапаратом назва файлу (\"%s\") не містить розширення!" #: gphoto2/main.c:654 #, c-format msgid "Invalid format '%s' (error at position %i)." -msgstr "" +msgstr "Неправильний формат \"%s\" (помилка у позиції %i)." #: gphoto2/main.c:701 -#, fuzzy, c-format +#, c-format msgid "File %s exists. Overwrite? [y|n] " -msgstr " %s դ. ?" +msgstr "Файл %s існує. Переписати? [y|n] " #: gphoto2/main.c:712 msgid "Specify new filename? [y|n] " -msgstr "" +msgstr "Ввести назву файлу? [y|n] " #: gphoto2/main.c:721 msgid "Enter new filename: " -msgstr "" +msgstr "Введіть назву файлу: " #: gphoto2/main.c:726 #, c-format msgid "Saving file as %s\n" -msgstr "" +msgstr "Збереження файлу як %s\n" -#: gphoto2/main.c:943 +#: gphoto2/main.c:918 #, c-format msgid "New file is in location %s%s%s on the camera\n" -msgstr "" +msgstr "Новий файл за адресою %s%s%s у фотоапараті\n" -#: gphoto2/main.c:1075 +#: gphoto2/main.c:1050 msgid "ERROR: " -msgstr "" +msgstr "ПОМИЛКА: " -#: gphoto2/main.c:1098 +#: gphoto2/main.c:1073 msgid "" "\n" "Aborting...\n" msgstr "" +"\n" +"Переривається...\n" -#: gphoto2/main.c:1104 +#: gphoto2/main.c:1079 msgid "Aborted.\n" -msgstr "" +msgstr "Перервано.\n" -#: gphoto2/main.c:1109 -#, fuzzy +#: gphoto2/main.c:1084 msgid "" "\n" "Cancelling...\n" -msgstr " %i...\n" +msgstr "" +"\n" +"Скасовується...\n" -#: gphoto2/main.c:1316 +#: gphoto2/main.c:1291 msgid "gphoto2 has been compiled without support for CDK." -msgstr "" +msgstr "gphoto2 скомпільовано без підтримки CDK." -#: gphoto2/main.c:1429 -#, fuzzy +#: gphoto2/main.c:1404 msgid "Operation cancelled.\n" -msgstr " צͦ." +msgstr "Операція скасована.\n" -#: gphoto2/main.c:1433 +#: gphoto2/main.c:1408 #, c-format msgid "" "*** Error (%i: '%s') *** \n" "\n" msgstr "" +"*** Помилка (%i: '%s') *** \n" +"\n" -#: gphoto2/main.c:1437 +#: gphoto2/main.c:1412 msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -888,87 +848,88 @@ "gphoto2 as follows:\n" "\n" msgstr "" +"Для виводу налагоджувальних повідомлень використовуйте ключ --debug\n" +"Налагоджувальні повідомлення можуть допомогти знайти розв'язання проблем.\n" +"Якщо ви збираєтесь надсилати будь-які повідомлення про помилки у список\n" +"розсилки розробників gphoto ,\n" +"запускайте gphoto2 наступним чином:\n" -#: gphoto2/main.c:1490 +#: gphoto2/main.c:1465 msgid "Overwrite files without asking." -msgstr "" +msgstr "Перезаписувати файли без запитування." -#: gphoto2/main.c:1504 +#: gphoto2/main.c:1479 msgid "path" -msgstr "" +msgstr "шлях" -#: gphoto2/main.c:1506 +#: gphoto2/main.c:1481 msgid "speed" -msgstr "" +msgstr "швидкість" -#: gphoto2/main.c:1508 +#: gphoto2/main.c:1483 msgid "model" -msgstr "" +msgstr "модель" -#: gphoto2/main.c:1510 +#: gphoto2/main.c:1485 msgid "filename" -msgstr "" +msgstr "назва_файлу" -#: gphoto2/main.c:1512 +#: gphoto2/main.c:1487 msgid "usbid" -msgstr "" +msgstr "usbid" -#: gphoto2/main.c:1516 +#: gphoto2/main.c:1491 msgid "folder" -msgstr "" +msgstr "тека" -#: gphoto2/main.c:1568 -#, fuzzy +#: gphoto2/main.c:1543 msgid "Capture a movie" -msgstr " " +msgstr "Захопити відео" -#: gphoto2/main.c:1578 +#: gphoto2/main.c:1553 msgid "Show summary" -msgstr "" +msgstr "Виводить зведення" -#: gphoto2/main.c:1580 -#, fuzzy +#: gphoto2/main.c:1555 msgid "Show camera driver manual" -msgstr " :" +msgstr "Виводить довідку про драйвер фотоапарату" -#: gphoto2/main.c:1582 -#, fuzzy +#: gphoto2/main.c:1557 msgid "About the camera driver manual" -msgstr " :" +msgstr "Про довідку драйвер фотоапарату" -#: gphoto2/main.c:1809 -msgid "" -"gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " -"location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" -msgstr "" - -#: gphoto2/main.c:1819 -msgid "" -"gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " -"location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" -msgstr "" +#: gphoto2/main.c:1784 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" +msgstr "gPhoto2 для OS/2 потребує встановлення адреси бібліотек фотокамери у змінній оточення CAMLIBS , наприклад SET CAMLIBS=C:\\GPHOTO2\\CAM\n" + +#: gphoto2/main.c:1794 +msgid "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" +msgstr "gPhoto2 для OS/2 потребує встановлення адреси бібліотек вводу-виводу у змінній оточення IOLIBS , наприклад SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" #: gphoto2/options.c:181 msgid "Usage:\n" -msgstr "" +msgstr "Використання:\n" #: gphoto2/options.c:184 msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" msgstr "" +"Короткі/довгі ключів (та аргументи) Опис\n" +"--------------------------------------------------------------------------------\n" #: gphoto2/options.c:209 #, c-format msgid "%-38s %s\n" -msgstr "" +msgstr "%-38s %s\n" #: gphoto2/options.c:214 msgid "" "--------------------------------------------------------------------------------\n" -"[Use double-quotes around arguments] [Picture numbers begin with one " -"(1)]\n" +"[Use double-quotes around arguments] [Picture numbers begin with one (1)]\n" msgstr "" +"--------------------------------------------------------------------------------\n" +"[Використовуйте лапки навколо аргументів] [Номери малюнків починаються з 1 ]\n" #: gphoto2/range.c:103 gphoto2/range.c:157 #, c-format @@ -976,6 +937,8 @@ "%s\n" "Image IDs must be a number greater than zero." msgstr "" +"%s\n" +"Ідентифікатори зображень повинні бути числами, більшими нуля." #: gphoto2/range.c:109 gphoto2/range.c:163 #, c-format @@ -983,6 +946,8 @@ "%s\n" "Image ID %i too high." msgstr "" +"%s\n" +"Ідентифікатор зображення %i надто великий." #: gphoto2/range.c:125 #, c-format @@ -990,6 +955,8 @@ "%s\n" "Ranges must be separated by ','." msgstr "" +"%s\n" +"Діапазони повинні відокремлюватись \",\"." #: gphoto2/range.c:139 #, c-format @@ -997,6 +964,8 @@ "%s\n" "Ranges need to start with a number." msgstr "" +"%s\n" +"Діапазони повинні починатись з цифри." #: gphoto2/range.c:179 #, c-format @@ -1004,6 +973,8 @@ "%s\n" "Unexpected character '%c'." msgstr "" +"%s\n" +"Неочікуваний символ '%c'." #: gphoto2/range.c:202 #, c-format @@ -1011,133 +982,125 @@ "%s\n" "Decreasing ranges are not allowed. You specified a range from %i to %i." msgstr "" +"%s\n" +"Діапазони, що зменшуються, не допускаються. Ви вказали діапазон від %i до %i." #: gphoto2/shell.c:55 #, c-format msgid "*** Error (%i: '%s') ***" -msgstr "" +msgstr "*** Помилка (%i: '%s') ***" #: gphoto2/shell.c:98 msgid "Change to a directory on the camera" -msgstr "" +msgstr "Змінює поточний каталог у камері" #: gphoto2/shell.c:99 gphoto2/shell.c:101 -#, fuzzy msgid "directory" -msgstr " :" +msgstr "каталог" #: gphoto2/shell.c:100 msgid "Change to a directory on the local drive" -msgstr "" +msgstr "Змінює поточний каталог у локальному пристрої" #: gphoto2/shell.c:102 gphoto2/shell.c:120 gphoto2/shell.c:121 -#, fuzzy msgid "Exit the gPhoto shell" -msgstr "צ gPhoto" +msgstr "Вихід з оболонки gPhoto" #: gphoto2/shell.c:103 -#, fuzzy msgid "Download a file" -msgstr " Φ " +msgstr "Завантажити файл" #: gphoto2/shell.c:103 gphoto2/shell.c:106 gphoto2/shell.c:108 #: gphoto2/shell.c:110 gphoto2/shell.c:111 gphoto2/shell.c:114 msgid "[directory/]filename" -msgstr "" +msgstr "[каталог/]назва_файлу" #: gphoto2/shell.c:105 -#, fuzzy msgid "Download a thumbnail" -msgstr " ." +msgstr "Завантажує мініатюру" #: gphoto2/shell.c:107 -#, fuzzy msgid "Download raw data" -msgstr " ." +msgstr "Завантажує необроблені дані" #: gphoto2/shell.c:111 msgid "Delete" -msgstr "" +msgstr "Видалення" #: gphoto2/shell.c:116 gphoto2/shell.c:122 msgid "Displays command usage" -msgstr "" +msgstr "Відображає довідку з команди" #: gphoto2/shell.c:117 gphoto2/shell.c:122 msgid "[command]" -msgstr "" +msgstr "[команда]" #: gphoto2/shell.c:118 msgid "List the contents of the current directory" -msgstr "" +msgstr "Виводить вміст поточного каталогу" #: gphoto2/shell.c:119 msgid "[directory/]" -msgstr "" +msgstr "[каталог/]" #: gphoto2/shell.c:421 msgid "Invalid command." -msgstr "" +msgstr "Неправильна команда." #: gphoto2/shell.c:430 #, c-format msgid "The command '%s' requires an argument." -msgstr "" +msgstr "Команда \"%s\" потребує вказування аргументу." #: gphoto2/shell.c:483 msgid "Invalid path." -msgstr "" +msgstr "Неправильний шлях." #: gphoto2/shell.c:529 -#, fuzzy msgid "Could not find home directory." -msgstr "" -" צ:\n" -"%s" +msgstr "Не вдається знайти домашній каталог." #: gphoto2/shell.c:537 -#, fuzzy, c-format +#, c-format msgid "Could not change to local directory '%s'." -msgstr "" -" צ:\n" -"%s" +msgstr "Не вдається знайти локальний каталог \"%s\"." #: gphoto2/shell.c:540 #, c-format msgid "Local directory now '%s'." -msgstr "" +msgstr "Тепер локальний каталог - \"%s\"" #: gphoto2/shell.c:578 #, c-format msgid "Remote directory now '%s'." -msgstr "" +msgstr "Тепер віддалений каталог - \"%s\"" #: gphoto2/shell.c:734 #, c-format msgid "Command '%s' not found. Use 'help' to get a list of available commands." -msgstr "" +msgstr "Команда \"%s\" не існує. Введіть \"help\", щоб отримати перелік наявних команд." #: gphoto2/shell.c:741 #, c-format msgid "Help on \"%s\":" -msgstr "" +msgstr "Довідка з \"%s\":" #: gphoto2/shell.c:743 msgid "Usage:" -msgstr "" +msgstr "Використання:" #: gphoto2/shell.c:747 msgid "Description:" -msgstr "" +msgstr "Опис:" #: gphoto2/shell.c:749 msgid "* Arguments in brackets [] are optional" -msgstr "" +msgstr "* Аргументи у дужках [] є необов'язковими." #: gphoto2/shell.c:770 msgid "Available commands:" -msgstr "" +msgstr "Доступні команди:" #: gphoto2/shell.c:775 msgid "To get help on a particular command, type in 'help command-name'." -msgstr "" +msgstr "Щоб отримати довідку про певну команду, введіть \"help назва_команди\"." diff -Naur gphoto2-2.1.4/po/zh_CN.gmo gphoto2/po/zh_CN.gmo --- gphoto2-2.1.4/po/zh_CN.gmo 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/zh_CN.gmo 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -l9 &))>+h)(=P`|  J'0@#q&'!!:;\; K XSe& !:> DQU\puN'7H`v##(G&@ g)q 4&P w"7I*Q -|!&& 4;P T [ z     !#! A!(O!x!+! !!!!!!!!!"("E"*a""""""""-""#"###'# K#l######l#N$uS$$$ %$%?%R%V%_%r%% %&%%@&V& p& z&&#&&&&'"';'?'F'Z'&^'E''"($("($(!)#;)_) c)o)x)A)#))))&***B*I*Q**** *+-+=4+ r+ |+++ +++ ++X,/,2-C-I-N-Q-V-[- `-l-r-x-I|-.... //9/Y/y//////000L0\0n0000 0 0G091/S1"11110212'P2;x22 U3 c3 p3H~33 334-4I4P4W4h4o4v44465M5616A6Q6d6w66666!6E7[7{7#7777 7 7 88!8;8$Z8 88888889909 C9/M9}999999"9$9!: -5:@:U; \;'f;!;';$;!;<!;<]< |<4<<6<=)=0=7=>=E=L=!S=u=====>>&>->4>;> B>!L>n>r> > >+>!>$>??#?3?'G?io???!a@@@@ @@ @@A0A7A>A^AAA B $B1B)ABkB~BBBBB BBB#C<(CeC+D.CD#rD&D&D)DE E #E -ED7E |EE E EEE E -F FFFF FF!F5FGGG*G1G 8G BG LG}YG{G2SH1HHHHHHH HH -HHU%}+CZp"<6@,qL8 & Bue$h_Nr-/)7nM0Sj\tg>i#Jy 421~fGF9!KcE?s;3 [QYdoI -H(bDv :TPRx`AXz|lVwm=^]a*'O5W{.k "%s" - "%s" (EXPERIMENTAL) - "%s" (TESTING) - -Aborting... - -Cancelling... - : %i - : Audio - : Image - : Preview - : Video - Downloaded: %s - Downloaded: %s - Height: %i pixel(s) - Mime type: '%s' - Mime type: '%s' - Name: '%s' - None available. - Permissions: Size: %li byte(s) - Size: %li byte(s) - Time: %s Width: %i pixel(s) -%-30s %-16s -%-38s %s -%s -Decreasing ranges are not allowed. You specified a range from %i to %i.%s -Image ID %i too high.%s -Image IDs must be a number greater than zero.%s -Ranges must be separated by ','.%s -Ranges need to start with a number.%s -Unexpected character '%c'.(expert only) Override USB IDs* Arguments in brackets [] are optional*** Error (%i: '%s') ****** Error (%i: '%s') *** - ----------------------------------------------------------- --------------------------------------------------------------------------------- -[Use double-quotes around arguments] [Picture numbers begin with one (1)] -ContinueCancelErrorALWAYS INCLUDE THE FOLLOWING LINES WHEN SENDING DEBUG MESSAGES TO THE MAILING LIST:Abilities for camera : %s -Aborted. -About the camera driverAbout the camera driver manualAbout the camera driver:AprAprilAudio data: -AugAugustAvailable commands:BackBad file number. You specified %i, but there are only %i files available in '%s' or its subfolders. Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there are only %i files available in '%s'.Please obtain a valid file number from a file listing first.Bad file number. You specified %i, but there is only 1 file available in '%s'.Camera driver manualCamera manual:Camera summary:Capture a movieCapture a movie Capture a quick previewCapture an audio clipCapture an imageCapture choices : -Change to a directory on the cameraChange to a directory on the local driveCommand '%s' not found. Use 'help' to get a list of available commands.Configuration support : %s -ConfigureCould not change to local directory '%s'.Could not find home directory.Could not parse EXIF data.Could not set configuration:Create a directoryDecDecemberDeleteDelete all files in folderDelete files given in rangeDelete files on camera support : %s -Description:Devices found: %i -Display camera abilitiesDisplay number of filesDisplay version and exitDisplays command usageDisplays this help screenDownload a fileDownload a thumbnailDownload raw dataERROR: EXIF data contains a thumbnail (%i bytes).EXIF tags:Enter new filename: ExitExit the gPhoto shellFebFebruaryFile %s exists. Overwrite? [y|n] File preview (thumbnail) support : %s -File upload support : %s -File: -For debugging messages, please use the --debug option. -Debugging messages may help finding a solution to your problem. -If you intend to send any error or debug messages to the gphoto -developer mailing list , please run -gphoto2 as follows: - -FriFridayGet all audio data from folderGet all files from folderGet all raw data from folderGet all thumbnails from folderGet audio data given in rangeGet files given in rangeGet raw data given in rangeGet thumbnails given in rangeHelp on "%s":Information on file '%s' (folder '%s'): -Invalid command.Invalid format '%s' (error at position %i).Invalid path.JanJanuaryJulJulyJunJuneList auto-detected camerasList files in folderList folders in folderList supported camera modelsList supported port devicesList the contents of the current directoryLocal directory now '%s'.MarMarchMayModelMonMondayNew file is in location %s%s%s on the camera -NoNo recursion (default for deletion)NovNovemberNumber of files in folder '%s': %i -Number of supported cameras: %i -OS/2 port by Bart van Leeuwen -OctOctoberOperation cancelledOperation cancelled. -Overwrite files without asking.Path Description --------------------------------------------------------------- -PortPorts must look like 'serial:/dev/ttyS0' or 'usb:', but '%s' is missing a colon so I am going to guess what you mean.Print filesize before dataQuiet output (default=verbose)Recursion (default for download)Remote directory now '%s'.Remove a directorySatSaturdaySaving file as %s -Send file to stdoutSepSeptemberSerial port support : %s -Short/long options (& argument) Description --------------------------------------------------------------------------------- -Show EXIF informationShow camera driver manualShow infoShow summarySpecify a filenameSpecify camera folder (default="/")Specify camera modelSpecify new filename? [y|n] Specify port deviceSpecify serial transfer speedSummary of camera statusSunSundaySupported cameras: -TagThe command '%s' requires an argument.The filename provided by the camera ('%s') does not contain a suffix!The port you specified ('%s') can not be found. Please specify one of the ports found by 'gphoto2 --list-ports' and make sure the spelling is correct (i.e. with prefix 'serial:' or 'usb:').There are %i files in folder '%s':There are %i folders in folder '%s':There are no files in folder '%s'.There are no folders in folder '%s'.There is one file in folder '%s':There is one folder in folder '%s':ThuThumbnail: -ThursdayTime: To get help on a particular command, type in 'help command-name'.Transfer speeds supported : -TueTuesdayTurn on debuggingUSB support : %s -Upload a file to cameraUsage:Usage: -Use the following syntax a:b=c:d to treat any USB device detected as a:b as c:d instead. a b c d should be hexadecimal numbers beginning with '0x'. -ValueValue: WedWednesdayYesYou can only specify speeds for serial ports.You cannot use '%n' in combination with non-persistent files![command][directory/][directory/]filenamedeletedirectoryfilenamefoldergPhoto shellgPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the location of the camera libraries. e.g. SET CAMLIBS=C:\GPHOTO2\CAM -gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the location of the io libraries. e.g. SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 has been compiled without EXIF support.gphoto2 has been compiled without support for CDK.modelnamenononepathreadread/deletespeedusbidyesProject-Id-Version: gphoto2 -Report-Msgid-Bugs-To: -POT-Creation-Date: 2004-01-18 21:01+0100 -PO-Revision-Date: 2002-11-21 09:26+0800 -Last-Translator: Wang Li -Language-Team: zh_CN -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - "%s" - "%s" (正在试用) - "%s" (正在测试) - -正在中断... - -正在取消... - ：%i - ：音频 - ：图像 - ：预览 - ：视频 - 已下载： %s - 已下载：%s - 高度： %i 像素 - Mime 类型： “%s” - Mime 类型： “%s” - 名称： “%s” - 不可用。 - 访问权限： 大小： %li 字节 - 大小： %li 字节 - 时间： %s 宽度： %i 像素 -%-30s %-16s -%-38s %s -%s -不允许缩小范围。您指定了一个从 %i 到 %i 的范围。%s -图像 ID %i 太大。%s -图像 IDs 必须是一个大于零的数。%s -范围必须由“,”分隔。%s -范围应以数字开头。%s -意外字符“%c”。(仅适于专家) 覆盖 USB ID* 出现在方括号 [] 中的参数是可选的*** 错误 (%i：“%s”) ****** 错误 (%i：“%s”) *** - ----------------------------------------------------------- --------------------------------------------------------------------------------- -[参数由双引号括起] [照片编号从 1 开始] -继续取消错误在将调试信息发送到邮件列表的时候总是包含下列行：相机功能 ：%s -已中断。 -关于相机驱动程序关于相机驱动程序手册关于相机驱动程序：四月四月音频数据： -八月八月可用的命令：退回错误的文件编号。您给出 %1$i，但在“%3$s”和它的子目录中只有 %2$i 个文件。请首先从文件列表中获取一个合法的文件编号。错误的文件编号。您给出 %1$i，但在“%3$s”中只有 %2$i 个文件。请首先从文件列表中获取一个合法的文件编号。错误的文件编号。您给出 %i，但在“%s”中只有一个文件。相机驱动程序手册相机手册：相机概要：拍摄一段电影捕捉一段电影捕捉一个快速预览捕捉一个音频片段捕捉一幅图像捕捉选项 ： -进入相机中的目录进入本地驱动器中的目录未找到“%s”命令。用“help”获取可用的命令列表。支持配置 ：%s -配置无法进入本地目录“%s”。无法找到家目录。无法解析 EXIF 数据。无法设置配置：创建目录十二月十二月删除删除文件夹中的所有文件删除给定范围中的文件支持删除相机内文件 ：%s -描述：找到设备：%i -显示相机功能显示文件的数量显示版本号并退出显示命令用法显示该求助屏幕下载一个文件下载一幅缩略图下载原始数据错误：EXIF 数据含有一幅缩略图 (%i 字节)。EXIF 标记：输入新文件名：退出退出 gPhoto shell二月二月文件 %s 存在。覆盖？[y|n] 支持文件预览 (缩略图)：%s -文件上载支持 ：%s -文件： -关于调试信息，请使用 --debug 选项。 -调试信息可能会帮助您找到问题的解决办法。 -如果您打算将任何错误或调试信息发送到 gphoto - 开发者邮件列表 中， -请按以下方式运行 gphoto2： - -周五星期五从文件夹中获取所有音频数据从文件夹中获取所有文件从文件夹中获取所有原始数据从文件夹中获取所有缩略图获取给定范围的音频数据获取给定范围的文件获取给定范围的原始数据获取给定范围的缩略图关于“%s”的求助信息：关于文件“%s”(文件夹“%s”)的信息： -非法命令。无效的格式“%s” (错误发生在 %i 字节)。非法路径。一月一月七月七月六月六月列举可以自动检测的相机列出文件夹中的文件列出文件夹中的文件夹列举支持的相机型号列举支持的端口设备列出当前目录的内容本地目录为“%s”。三月三月五月型号周一星期一新文件在相机中 %s%s%s 处 -否不递归 (删除时默认)十一月十一月文件夹 “%s” 中文件的数量：%i -支持相机数量 ：%i -由 Bart van Leeuwen 移植到 OS/2 -十月十月操作已取消操作已取消。 -在不查询的情况下覆盖文件。路径 描述 --------------------------------------------------------------- -端口端口必须是类似“serial:/dev/ttyS0”或“usb:”的形式，但“%s”缺少冒号，所以我将猜测您的意图。在数据前面打印文件大小少量输出 (默认为大量)递归 (下载时默认)远程目录为“%s”。删除目录周六星期六正在将文件另存为 %s -将文件发送到标准输出九月九月串口支持 ：%s -长/短选项 (及参数) 描述 --------------------------------------------------------------------------------- -显示 EXIF 信息显示相机驱动程序手册显示信息显示概要指定文件名指定相机文件夹 (默认为 “/”)指定相机型号给出新文件名？[y|n]指定端口设备指定串行传输速度相机状态概要周日星期日已支持相机： -标记命令“%s”需要一个参数。由照相机 (“%s”) 提供的文件名不含有后缀！无法找到您指定的端口 (“%s”)。请指定一个由“gphoto2 --list-ports”列出的端口并确信拼写正确 (例如，带有前缀“serial:”或“usb:”)。文件夹“%2$s”中有 %1$i 个文件：文件夹“%2$s”中有 %1$i 个文件夹：文件夹“%s”中没有文件。文件夹“%s”中没有文件夹。文件夹“%s”中有一个文件：文件夹“%s”中有一个文件夹：周四缩略图： -星期四时间：为得到特定命令的求助信息，输入“help 命令名”。支持的传输速度 ： -周二星期二开始调试USB 支持 ：%s -将一个文件上载到相机用法：用法： -使用诸如 a:b=c:d 的形式将探测为 a:b 的 USB 设备处理为 c:d。a b c d 应为以“0x”开始的十六进制数。 -值值：周三星期三是您只能为串口指定速度。您不能把“%n”同非永久文件一起使用！[命令][目录][目录/]文件删除目录文件名文件夹gPhoto shellOS/2 版的 gPhoto2 要求您将环境变量 CAMLIBS 设置为相机库所在的位置。例如，SET CAMLIBS=C:\GPHOTO2\CAM -OS/2 版的 gPhoto2 要求您将环境变量 IOLIBS 设置为 io 库所在的位置。例如，SET IOLIBS=C:\GPHOTO2\IOLIB -gphoto2 编译时没有包含对 EXIF 的支持。gphoto2 编译时没有包含对 CDK 的支持。型号名称否无路径读取读取/删除速度USB 编号是 \ No newline at end of file diff -Naur gphoto2-2.1.4/po/zh_CN.po gphoto2/po/zh_CN.po --- gphoto2-2.1.4/po/zh_CN.po 2004-01-18 21:01:46.000000000 +0100 +++ gphoto2/po/zh_CN.po 2004-03-22 01:01:42.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-01-18 21:01+0100\n" +"POT-Creation-Date: 2004-03-22 00:36+0100\n" "PO-Revision-Date: 2002-11-21 09:26+0800\n" "Last-Translator: Wang Li \n" "Language-Team: zh_CN \n" @@ -64,12 +64,14 @@ # frontends/command-line/actions.c:141 #: gphoto2/actions.c:190 +#, c-format msgid "File:\n" msgstr "文件：\n" # frontends/command-line/actions.c:143 frontends/command-line/actions.c:177 # frontends/command-line/actions.c:193 #: gphoto2/actions.c:192 gphoto2/actions.c:226 gphoto2/actions.c:242 +#, c-format msgid " None available.\n" msgstr " 不可用。\n" @@ -133,26 +135,31 @@ # frontends/command-line/actions.c:159 #: gphoto2/actions.c:208 +#, c-format msgid " Permissions: " msgstr " 访问权限：" # frontends/command-line/actions.c:162 #: gphoto2/actions.c:211 +#, c-format msgid "read/delete" msgstr "读取/删除" # frontends/command-line/actions.c:164 #: gphoto2/actions.c:213 +#, c-format msgid "read" msgstr "读取" # frontends/command-line/actions.c:166 #: gphoto2/actions.c:215 +#, c-format msgid "delete" msgstr "删除" # frontends/command-line/actions.c:168 #: gphoto2/actions.c:217 +#, c-format msgid "none" msgstr "无" @@ -164,11 +171,13 @@ # frontends/command-line/actions.c:175 #: gphoto2/actions.c:224 +#, c-format msgid "Thumbnail:\n" msgstr "缩略图：\n" # frontends/command-line/actions.c:191 #: gphoto2/actions.c:240 +#, c-format msgid "Audio data:\n" msgstr "音频数据：\n" @@ -197,6 +206,7 @@ # frontends/command-line/actions.c:326 #: gphoto2/actions.c:396 +#, c-format msgid "EXIF tags:" msgstr "EXIF 标记：" @@ -229,6 +239,7 @@ # frontends/command-line/main.c:465 #: gphoto2/actions.c:451 +#, c-format msgid "Supported cameras:\n" msgstr "已支持相机：\n" @@ -258,6 +269,7 @@ # frontends/command-line/main.c:549 #: gphoto2/actions.c:501 +#, c-format msgid "" "Path Description\n" "--------------------------------------------------------------\n" @@ -283,6 +295,7 @@ # frontends/command-line/main.c:385 #: gphoto2/actions.c:541 +#, c-format msgid "----------------------------------------------------------\n" msgstr "----------------------------------------------------------\n" @@ -306,6 +319,7 @@ # frontends/command-line/main.c:420 #: gphoto2/actions.c:565 +#, c-format msgid "Transfer speeds supported :\n" msgstr "支持的传输速度 ：\n" @@ -317,32 +331,37 @@ # frontends/command-line/main.c:427 #: gphoto2/actions.c:570 +#, c-format msgid "Capture choices :\n" msgstr "捕捉选项 ：\n" # frontends/command-line/main.c:429 #: gphoto2/actions.c:572 +#, c-format msgid " : Image\n" msgstr " ：图像\n" # frontends/command-line/main.c:431 #: gphoto2/actions.c:576 +#, c-format msgid " : Video\n" msgstr " ：视频\n" # frontends/command-line/main.c:433 #: gphoto2/actions.c:580 +#, c-format msgid " : Audio\n" msgstr " ：音频\n" # frontends/command-line/main.c:435 #: gphoto2/actions.c:584 +#, c-format msgid " : Preview\n" msgstr " ：预览\n" # frontends/command-line/main.c:435 #: gphoto2/actions.c:588 -#, fuzzy +#, fuzzy, c-format msgid "" " : Capture not supported by the driver\n" msgstr " ：预览\n" @@ -394,20 +413,24 @@ # frontends/command-line/main.c:243 #: gphoto2/actions.c:692 +#, c-format msgid "About the camera driver:" msgstr "关于相机驱动程序：" # frontends/command-line/main.c:1180 #: gphoto2/actions.c:706 +#, c-format msgid "Camera summary:" msgstr "相机概要：" # frontends/command-line/main.c:1192 #: gphoto2/actions.c:720 +#, c-format msgid "Camera manual:" msgstr "相机手册：" #: gphoto2/actions.c:736 +#, c-format msgid "You can only specify speeds for serial ports." msgstr "您只能为串口指定速度。" @@ -416,7 +439,7 @@ msgid "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-2003 Lutz Mueller and others\n" +"Copyright (c) 2000-2004 Lutz Mueller and others\n" "%s\n" "gphoto2 comes with NO WARRANTY, to the extent permitted by law. You may\n" "redistribute copies of gphoto2 under the terms of the GNU General Public\n" @@ -478,17 +501,19 @@ # frontends/command-line/main.c:1753 #: gphoto2/gp-params.c:53 -#, fuzzy +#, fuzzy, c-format msgid "*** Error *** \n" msgstr "" "*** 错误 (%i：“%s”) *** \n" "\n" #: gphoto2/gp-params.c:220 +#, c-format msgid "Press any key to continue.\n" msgstr "" #: gphoto2/gp-params.c:237 +#, c-format msgid "Not enough memory." msgstr "" @@ -788,6 +813,7 @@ # frontends/command-line/main.c:637 #: gphoto2/main.c:343 gphoto2/main.c:1217 +#, c-format msgid "" "Use the following syntax a:b=c:d to treat any USB device detected as a:b as " "c:d instead. a b c d should be hexadecimal numbers beginning with '0x'.\n" @@ -991,11 +1017,13 @@ # frontends/command-line/main.c:870 #: gphoto2/main.c:712 +#, c-format msgid "Specify new filename? [y|n] " msgstr "给出新文件名？[y|n]" # frontends/command-line/main.c:879 #: gphoto2/main.c:721 +#, c-format msgid "Enter new filename: " msgstr "输入新文件名：" @@ -1013,11 +1041,13 @@ # frontends/command-line/main.c:1614 #: gphoto2/main.c:1075 +#, c-format msgid "ERROR: " msgstr "错误：" # frontends/command-line/main.c:1637 #: gphoto2/main.c:1098 +#, c-format msgid "" "\n" "Aborting...\n" @@ -1027,11 +1057,13 @@ # frontends/command-line/main.c:1643 #: gphoto2/main.c:1104 +#, c-format msgid "Aborted.\n" msgstr "已中断。\n" # frontends/command-line/main.c:1648 #: gphoto2/main.c:1109 +#, c-format msgid "" "\n" "Cancelling...\n" @@ -1046,6 +1078,7 @@ # frontends/command-line/main.c:1750 #: gphoto2/main.c:1429 +#, c-format msgid "Operation cancelled.\n" msgstr "操作已取消。\n" @@ -1061,6 +1094,7 @@ # frontends/command-line/main.c:1759 #: gphoto2/main.c:1437 +#, c-format msgid "" "For debugging messages, please use the --debug option.\n" "Debugging messages may help finding a solution to your problem.\n" @@ -1127,6 +1161,7 @@ # frontends/command-line/main.c:1699 #: gphoto2/main.c:1809 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value CAMLIBS to the " "location of the camera libraries. e.g. SET CAMLIBS=C:\\GPHOTO2\\CAM\n" @@ -1136,6 +1171,7 @@ # frontends/command-line/main.c:1709 #: gphoto2/main.c:1819 +#, c-format msgid "" "gPhoto2 for OS/2 requires you to set the enviroment value IOLIBS to the " "location of the io libraries. e.g. SET IOLIBS=C:\\GPHOTO2\\IOLIB\n" @@ -1145,11 +1181,13 @@ # frontends/command-line/options.c:212 #: gphoto2/options.c:181 +#, c-format msgid "Usage:\n" msgstr "用法：\n" # frontends/command-line/options.c:215 #: gphoto2/options.c:184 +#, c-format msgid "" "Short/long options (& argument) Description\n" "--------------------------------------------------------------------------------\n" @@ -1165,6 +1203,7 @@ # frontends/command-line/options.c:245 #: gphoto2/options.c:214 +#, c-format msgid "" "--------------------------------------------------------------------------------\n" "[Use double-quotes around arguments] [Picture numbers begin with one " @@ -1361,25 +1400,30 @@ # frontends/command-line/shell.c:752 #: gphoto2/shell.c:743 +#, c-format msgid "Usage:" msgstr "用法：" # frontends/command-line/shell.c:756 #: gphoto2/shell.c:747 +#, c-format msgid "Description:" msgstr "描述：" # frontends/command-line/shell.c:758 #: gphoto2/shell.c:749 +#, c-format msgid "* Arguments in brackets [] are optional" msgstr "* 出现在方括号 [] 中的参数是可选的" # frontends/command-line/shell.c:779 #: gphoto2/shell.c:770 +#, c-format msgid "Available commands:" msgstr "可用的命令：" # frontends/command-line/shell.c:784 #: gphoto2/shell.c:775 +#, c-format msgid "To get help on a particular command, type in 'help command-name'." msgstr "为得到特定命令的求助信息，输入“help 命令名”。" diff -Naur gphoto2-2.1.4/TODO gphoto2/TODO --- gphoto2-2.1.4/TODO 2004-01-18 21:01:08.000000000 +0100 +++ gphoto2/TODO 2004-03-24 02:38:31.000000000 +0100 @@ -4,3 +4,9 @@ line, for example: gphoto2 -o Zoom=15.3 -o Aperture=F2.8 -o LensMode=Macro --capture-image + +Hans Ulrich Niedermann + +And re-design the complete command line syntax into something +consistent, powerful and easy to understand, using one command line +parser instead of two.