diff options
| author | Michael Biebl <biebl@debian.org> | 2010-11-18 06:11:41 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-11-18 06:11:41 +0100 |
| commit | fc714f1f24f9f12335b53f36c2765dc0077e3410 (patch) | |
| tree | 456647b5228001a2ee742e131dfb290c269e8588 | |
| parent | 0fe1d7b5874ca26dfbc05dc1fd2f943a4ee5554c (diff) | |
| download | avahi-fc714f1f24f9f12335b53f36c2765dc0077e3410.tar.gz | |
Imported Upstream version 0.6.28upstream/0.6.28
82 files changed, 9535 insertions, 4680 deletions
@@ -18,35 +18,7 @@ explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and work on translations can contact the appropriate team. - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters +1.1 INSTALL Matters =================== Some packages are "localizable" when properly installed; the programs @@ -56,36 +28,19 @@ internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. Installers may use special +options at configuration time for changing the default behaviour. The +command: - ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. +will _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. +probably detect the previously built and installed `libintl' library +and will decide to use it. If not, you may have to to use the +`--with-libintl-prefix' option to tell `configure' where to look for it. Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -96,7 +51,7 @@ may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package +1.2 Using This Package ====================== As a user, if your language has been installed for this package, you @@ -148,7 +103,7 @@ to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams +1.3 Translating Teams ===================== For the Free Translation Project to be a success, we need interested @@ -177,859 +132,1118 @@ reach the coordinator for all translator teams. the terminology in use. Proven linguistic skills are praised more than programming skills, here. -1.5 Available Packages +1.4 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of November -2007. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of June +2010. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - Compendium | [] [] [] [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - dialog | | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - fetchmail | [] [] () [] [] | - findutils | [] | - findutils_stable | [] [] [] | - flex | [] [] [] | - fslint | | - gas | | - gawk | [] [] [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gip | [] | - gliv | [] [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | [] [] () () [] | - gnuedu | | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | | - gramadoir | [] [] | - grep | [] [] | - gretl | () | - gsasl | | - gss | | - gst-plugins-bad | [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gst-plugins-ugly | [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] | - indent | [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lprng | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] | - make | [] [] | - man-db | [] [] [] | - minicom | [] [] [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] | - pwdutils | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - shared-mime-info | [] [] [] [] () [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - skencil | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] | - texinfo | [] [] [] | - tin | () () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 - - es et eu fa fi fr ga gl gu he hi hr hu id is it + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | [] [] [] () | + a2ps | [] [] | aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] | - bfd | [] [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - dialog | [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - fetchmail | [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] | - flex | [] [] [] | - fslint | | - gas | [] [] | - gawk | [] [] [] [] () | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] [] | - gip | [] [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnuedu | [] | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] [] | - gpsdrive | [] | - gramadoir | [] [] | - grep | [] [] [] | - gretl | [] [] [] () | - gsasl | [] [] | - gss | [] [] | - gst-plugins-bad | [] [] [] [] | - gst-plugins-base | [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] [] | - latrine | [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] [] [] | - lingoteach | [] [] [] | - lprng | | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - nano | [] [] [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | [] | - skencil | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - tin | [] () | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - util-linux-ng | [] [] [] [] [] [] [] | - vorbis-tools | | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 - - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - +--------------------------------------------------+ - Compendium | [] | - a2ps | () [] [] | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | bfd | | - bibshelf | [] | + bibshelf | [] | binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | [] | - cpplib | [] | - cryptonit | [] | - dialog | [] [] | - diffutils | [] [] [] | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | doodle | | - e2fsprogs | [] | - enscript | [] | - fetchmail | [] [] | - findutils | [] | - findutils_stable | [] | - flex | [] [] | - fslint | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | gas | | - gawk | [] [] | - gcal | | + gawk | [] [] | + gcal | [] | gcc | | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | gnubiff | | - gnucash | () () () | + gnucash | [] | gnuedu | | - gnulib | [] [] | + gnulib | | gnunet | | gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | [] | - gpsdrive | [] | - gramadoir | () | - grep | [] [] | - gretl | | - gsasl | [] | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] | - herrie | [] | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | hylafax | | - idutils | [] | - indent | [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] | - libexif | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | libextractor | | - libgpewidget | [] | + libgnutls | | + libgpewidget | | libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | [] | - libidn | [] [] | - lifelines | [] | - lilypond | [] | - lingoteach | [] | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | lprng | | - lynx | [] [] | - m4 | [] [] | + lynx | [] | + m4 | | mailfromd | | mailutils | | - make | [] [] [] | + make | | man-db | | - minicom | [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] [] [] | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | pwdutils | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - shared-mime-info | [] [] [] [] [] [] [] | - sharutils | [] [] | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | shishi | | skencil | | - solfege | () () | + solfege | | + solfege-manual | | soundtracker | | - sp | () | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] | + sp | | + sysstat | | + tar | [] | + texinfo | | tin | | - tuxpaint | () [] [] | unicode-han-tra... | | unicode-transla... | | - util-linux | [] [] | - util-linux-ng | [] [] | + util-linux-ng | [] | + vice | | + vmm | | vorbis-tools | | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 - - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] [] | - bash | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - dialog | [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] [] | - gcal | [] | - gcc | [] [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () [] | - gnucash | () [] | - gnuedu | | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] | - gramadoir | [] [] | - grep | [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] | - gst-plugins-ugly | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] | - gtkam | [] [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - herrie | [] [] [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] [] | - libgpg-error | [] [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lprng | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] [] [] [] | - minicom | [] [] [] [] [] | - nano | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | [] [] | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - skencil | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - tin | () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | wastesedge | | - wdiff | [] [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | +--------------------------------------------------+ - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 + af am an ar as ast az be be@latin bg bn_IN bs ca + 6 0 1 2 3 19 1 10 3 28 3 1 38 + + crh cs da de el en en_GB en_ZA eo es et eu fa + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] | + flex | [] [] | + freedink | [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] | + gjay | [] | + gliv | [] [] [] | + glunarclock | [] [] | + gnubiff | () | + gnucash | [] () () () () | + gnuedu | [] [] | + gnulib | [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] () [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] | + gsasl | [] | + gss | | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] () [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] | + help2man | [] | + hylafax | [] [] | + idutils | [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] [] [] [] () [] [] [] () | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] | + iso_639 | [] [] [] [] () [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | [] [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] [] | + keytouch-keyboa... | [] | + klavaro | [] [] [] [] | + latrine | [] () | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] | + linkdr | [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] | + mkisofs | | + myserver | | + nano | [] [] [] | + opcodes | [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] | + psmisc | [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] | + wyslij-po | | + xchat | [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + crh cs da de el en en_GB en_ZA eo es et eu fa + 5 64 105 117 18 1 8 0 28 89 18 19 0 + + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] [] | + bibshelf | [] [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] | + cflow | [] [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] [] | + gjay | [] | + gliv | [] () | + glunarclock | [] [] [] [] | + gnubiff | () [] () | + gnucash | () () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | [] () [] [] [] [] | + iso_639 | [] () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] [] | + keytouch-editor | [] [] [] [] [] | + keytouch-keyboa... | [] [] [] [] [] | + klavaro | [] [] | + latrine | [] [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] [] | + linkdr | [] [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] [] | + myserver | | + nano | [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +----------------------------------------------------+ + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 + + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - Compendium | [] [] [] [] | 19 - a2ps | [] [] [] | 19 - aegis | [] | 1 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 16 - bash | [] | 6 - bfd | | 2 - bibshelf | [] | 7 - binutils | [] [] [] [] | 9 - bison | [] [] [] [] | 20 - bison-runtime | [] [] [] [] | 18 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 9 - console-tools | [] [] | 5 - coreutils | [] [] [] | 18 - cpio | [] [] [] [] | 11 - cpplib | [] [] [] [] [] | 12 - cryptonit | [] | 6 - dialog | [] [] [] | 9 - diffutils | [] [] [] [] [] | 29 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - fetchmail | [] [] | 12 - findutils | [] [] [] | 11 - findutils_stable | [] [] [] [] | 18 - flex | [] [] | 15 - fslint | [] | 2 - gas | [] | 3 - gawk | [] [] [] | 16 - gcal | [] | 5 - gcc | [] [] [] | 7 - gettext-examples | [] [] [] [] [] [] | 29 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 20 - gip | [] [] | 13 - gliv | [] [] | 11 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 16 - gnubiff | [] | 2 - gnucash | () [] | 5 - gnuedu | [] | 2 - gnulib | [] | 10 - gnunet | | 0 - gnunet-gtk | [] [] | 3 - gnutls | | 4 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] | 7 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] [] | 16 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] [] | 22 - gpe-filemanager | [] [] | 7 - gpe-go | [] [] [] [] | 19 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] [] | 21 - gpe-taskmanager | [] [] [] [] | 21 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] [] | 8 - gphoto2 | [] [] [] [] | 21 - gprof | [] [] | 13 - gpsdrive | [] | 5 - gramadoir | [] | 7 - grep | [] | 12 - gretl | | 6 - gsasl | [] [] [] | 9 - gss | [] | 7 - gst-plugins-bad | [] [] [] | 13 - gst-plugins-base | [] [] | 11 - gst-plugins-good | [] [] [] [] [] | 16 - gst-plugins-ugly | [] [] [] | 13 - gstreamer | [] [] [] | 18 - gtick | [] [] | 7 - gtkam | [] | 16 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 27 - gutenprint | | 4 - hello | [] [] [] [] [] | 38 - herrie | [] [] | 8 - hylafax | | 0 - idutils | [] [] | 15 - indent | [] [] [] [] [] | 28 - iso_15924 | [] [] | 4 - iso_3166 | [] [] [] [] [] [] [] [] [] | 54 - iso_3166_2 | [] [] | 4 - iso_4217 | [] [] [] [] [] | 24 - iso_639 | [] [] [] [] [] | 26 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] [] | 13 - keytouch | [] | 8 - keytouch-editor | [] | 5 - keytouch-keyboa... | [] | 5 - latrine | [] [] | 5 - ld | [] [] [] [] | 10 - leafpad | [] [] [] [] [] | 24 - libc | [] [] [] | 19 - libexif | [] | 5 - libextractor | [] | 5 - libgpewidget | [] [] [] | 20 - libgpg-error | [] | 6 - libgphoto2 | [] [] | 9 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] [] | 11 - libidn | [] [] | 11 - lifelines | | 4 - lilypond | [] | 6 - lingoteach | [] | 6 - lprng | [] | 2 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailfromd | [] [] | 3 - mailutils | [] [] | 8 - make | [] [] [] | 20 - man-db | [] | 9 - minicom | [] | 14 - nano | [] [] [] | 20 - opcodes | [] [] | 10 - parted | [] [] [] | 11 - pilot-qof | [] | 1 - popt | [] [] [] [] | 18 - psmisc | [] [] | 10 - pwdutils | [] | 3 - qof | [] | 4 - radius | [] [] | 7 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 13 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] [] | 23 - shared-mime-info | [] [] [] | 29 - sharutils | [] [] [] | 23 - shishi | [] | 3 - skencil | [] | 7 - solfege | [] | 3 - soundtracker | [] [] | 9 - sp | [] | 3 - system-tools-ba... | [] [] [] [] [] [] [] | 38 - tar | [] [] [] | 17 - texinfo | [] [] [] | 15 - tin | | 1 - tuxpaint | [] [] [] | 19 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] [] | 12 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 14 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 29 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () [] () | 10 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 26 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] | 24 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 7 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 14 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] [] | 17 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - util-linux-ng | [] [] [] | 20 - vorbis-tools | [] [] | 4 - wastesedge | | 1 - wdiff | [] [] | 23 - wget | [] [] [] | 20 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] | 14 - xpad | [] [] [] | 15 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 + xkeyboard-config | [] [] [] | 22 +---------------------------------------------------+ - 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 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 @@ -1042,12 +1256,12 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If November 2007 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If June 2010 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://translationproject.org/extra/matrix.html'. -1.6 Using `gettext' in new packages +1.5 Using `gettext' in new packages =================================== If you are writing a freely available program and want to @@ -1,4 +1,4 @@ -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> +2010-10-04 gettextize <bug-gnu-gettext@gnu.org> * Makefile.am (EXTRA_DIST): Add config.rpath. * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in. diff --git a/Makefile.in b/Makefile.in index 1c2279d..e431ff2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -395,6 +395,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -467,7 +469,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, +[m4_warning([this file was generated for autoconf 2.66. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -301,7 +301,7 @@ msgstr "" dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -430,7 +430,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir", dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -453,6 +453,7 @@ fi]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # @@ -480,7 +481,10 @@ fi]) AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -493,7 +497,6 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -502,21 +505,20 @@ fi[]dnl # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], @@ -569,6 +571,7 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` @@ -578,7 +581,7 @@ if test $pkg_failed = yes; then # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -586,25 +589,24 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT]) + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], - [$4]) +To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES diff --git a/avahi-autoipd/Makefile.in b/avahi-autoipd/Makefile.in index ab7aecd..5adf3f6 100644 --- a/avahi-autoipd/Makefile.in +++ b/avahi-autoipd/Makefile.in @@ -303,6 +303,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -375,7 +377,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index 4b35f7c..a1bddb2 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -1060,7 +1060,7 @@ static int loop(int iface, uint32_t addr) { int next_wakeup_valid = 0; char buf[64]; ArpPacket *in_packet = NULL; - size_t in_packet_len; + size_t in_packet_len = 0; ArpPacket *out_packet = NULL; size_t out_packet_len; uint8_t hw_address[ETHER_ADDRLEN]; diff --git a/avahi-client/Makefile.in b/avahi-client/Makefile.in index b09c1b1..1372e2c 100644 --- a/avahi-client/Makefile.in +++ b/avahi-client/Makefile.in @@ -372,6 +372,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -444,7 +446,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-client/client.c b/avahi-client/client.c index 2b29480..70cc35d 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -55,7 +55,7 @@ int avahi_client_set_dbus_error(AvahiClient *client, DBusError *error) { return avahi_client_set_errno(client, avahi_error_dbus_to_number(error->name)); } -static void client_set_state (AvahiClient *client, AvahiServerState state) { +static void client_set_state(AvahiClient *client, AvahiClientState state) { assert(client); if (client->state == state) @@ -324,7 +324,7 @@ static int get_server_state(AvahiClient *client, int *ret_error) { dbus_error_is_set (&error)) goto fail; - client_set_state(client, (AvahiServerState) state); + client_set_state(client, (AvahiClientState) state); dbus_message_unref(message); dbus_message_unref(reply); @@ -478,6 +478,7 @@ static DBusConnection* avahi_dbus_bus_get(DBusError *error) { AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, AvahiClientCallback callback, void *userdata, int *ret_error) { AvahiClient *client = NULL; DBusError error; + DBusMessage *message = NULL, *reply = NULL; avahi_init_i18n(); @@ -551,7 +552,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, if (dbus_error_is_set(&error)) goto fail; - dbus_bus_add_match ( + dbus_bus_add_match( client->bus, "type='signal', " "interface='" DBUS_INTERFACE_LOCAL "'", @@ -560,8 +561,12 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, if (dbus_error_is_set(&error)) goto fail; - if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) { + if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, "org.freedesktop.DBus.Peer", "Ping"))) + goto fail; + reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error); + + if (!reply || dbus_error_is_set (&error)) { /* We free the error so its not set, that way the fail target * will return the NO_DAEMON error rather than a DBUS error */ dbus_error_free(&error); @@ -584,10 +589,20 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, goto fail; } + dbus_message_unref(message); + + if (reply) + dbus_message_unref(reply); + return client; fail: + if (message) + dbus_message_unref(message); + if (reply) + dbus_message_unref(reply); + if (client) avahi_client_free(client); diff --git a/avahi-common/Makefile.in b/avahi-common/Makefile.in index d23808e..8fa3304 100644 --- a/avahi-common/Makefile.in +++ b/avahi-common/Makefile.in @@ -377,6 +377,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -449,7 +451,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-compat-howl/Makefile.in b/avahi-compat-howl/Makefile.in index 49d1a17..8df0d8f 100644 --- a/avahi-compat-howl/Makefile.in +++ b/avahi-compat-howl/Makefile.in @@ -455,6 +455,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -527,7 +529,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-compat-howl/samples/Makefile.in b/avahi-compat-howl/samples/Makefile.in index 576d551..69a23f9 100644 --- a/avahi-compat-howl/samples/Makefile.in +++ b/avahi-compat-howl/samples/Makefile.in @@ -293,6 +293,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -365,7 +367,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-compat-libdns_sd/Makefile.in b/avahi-compat-libdns_sd/Makefile.in index 2dac9bb..c2d97d0 100644 --- a/avahi-compat-libdns_sd/Makefile.in +++ b/avahi-compat-libdns_sd/Makefile.in @@ -326,6 +326,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -398,7 +400,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-core/Makefile.in b/avahi-core/Makefile.in index 94e4868..0fb47c2 100644 --- a/avahi-core/Makefile.in +++ b/avahi-core/Makefile.in @@ -439,6 +439,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -511,7 +513,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-daemon/Makefile.in b/avahi-daemon/Makefile.in index 4ab4ccb..6b3d49e 100644 --- a/avahi-daemon/Makefile.in +++ b/avahi-daemon/Makefile.in @@ -411,6 +411,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -483,7 +485,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in index 6f05b4a..82f431f 100644 --- a/avahi-daemon/avahi-daemon.service.in +++ b/avahi-daemon/avahi-daemon.service.in @@ -30,3 +30,4 @@ NotifyAccess=main [Install] WantedBy=multi-user.target Also=avahi-daemon.socket +Alias=dbus-org.freedesktop.Avahi.service diff --git a/avahi-daemon/org.freedesktop.Avahi.service b/avahi-daemon/org.freedesktop.Avahi.service index ebc5f31..30ed2d8 100644 --- a/avahi-daemon/org.freedesktop.Avahi.service +++ b/avahi-daemon/org.freedesktop.Avahi.service @@ -17,7 +17,7 @@ [D-BUS Service] Name=org.freedesktop.Avahi -SystemdService=avahi-daemon.service +SystemdService=dbus-org.freedesktop.Avahi.service # This service should not be bus activated if systemd isn't running, # so that activation won't conflict with the init script startup. diff --git a/avahi-daemon/sd-daemon.c b/avahi-daemon/sd-daemon.c index 3bb258d..316fccc 100644 --- a/avahi-daemon/sd-daemon.c +++ b/avahi-daemon/sd-daemon.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** Copyright 2010 Lennart Poettering @@ -325,18 +325,13 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t } int sd_notify(int unset_environment, const char *state) { -#if defined(DISABLE_SYSTEMD) || !defined(__linux__) +#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC) return 0; #else int fd = -1, r; struct msghdr msghdr; struct iovec iovec; union sockaddr_union sockaddr; - struct ucred *ucred; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; - } control; const char *e; if (!state) { @@ -369,16 +364,6 @@ int sd_notify(int unset_environment, const char *state) { iovec.iov_base = (char*) state; iovec.iov_len = strlen(state); - memset(&control, 0, sizeof(control)); - control.cmsghdr.cmsg_level = SOL_SOCKET; - control.cmsghdr.cmsg_type = SCM_CREDENTIALS; - control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); - - ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); - ucred->pid = getpid(); - ucred->uid = getuid(); - ucred->gid = getgid(); - memset(&msghdr, 0, sizeof(msghdr)); msghdr.msg_name = &sockaddr; msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e); @@ -388,8 +373,6 @@ int sd_notify(int unset_environment, const char *state) { msghdr.msg_iov = &iovec; msghdr.msg_iovlen = 1; - msghdr.msg_control = &control; - msghdr.msg_controllen = control.cmsghdr.cmsg_len; if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { r = -errno; @@ -441,12 +424,50 @@ int sd_booted(void) { /* We simply test whether the systemd cgroup hierarchy is * mounted */ - if (lstat("/cgroup", &a) < 0) + if (lstat("/sys/fs/cgroup", &a) < 0) return 0; - if (lstat("/cgroup/systemd", &b) < 0) + if (lstat("/sys/fs/cgroup/systemd", &b) < 0) return 0; return a.st_dev != b.st_dev; #endif } + +static int touch(const char *path) { + +#if !defined(DISABLE_SYSTEMD) && defined(__linux__) + int fd; + + mkdir("/dev/.systemd", 0755); + mkdir("/dev/.systemd/readahead", 0755); + + if ((fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0666)) < 0) + return -errno; + + for (;;) { + if (close(fd) >= 0) + break; + + if (errno != -EINTR) + return -errno; + } + +#endif + return 0; +} + +int sd_readahead(const char *action) { + + if (!action) + return -EINVAL; + + if (strcmp(action, "cancel") == 0) + return touch("/dev/.systemd/readahead/cancel"); + else if (strcmp(action, "done") == 0) + return touch("/dev/.systemd/readahead/done"); + else if (strcmp(action, "noreplay") == 0) + return touch("/dev/.systemd/readahead/noreplay"); + + return -EINVAL; +} diff --git a/avahi-daemon/sd-daemon.h b/avahi-daemon/sd-daemon.h index fd6221f..2fbfe95 100644 --- a/avahi-daemon/sd-daemon.h +++ b/avahi-daemon/sd-daemon.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef foosddaemonhfoo #define foosddaemonhfoo @@ -69,9 +69,13 @@ extern "C" { #if __GNUC__ >= 4 #define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) -#define _sd_hidden_ __attribute__ ((visibility("hidden"))) #else #define _sd_printf_attr_(a,b) +#endif + +#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS) +#define _sd_hidden_ __attribute__ ((visibility("hidden"))) +#else #define _sd_hidden_ #endif @@ -171,7 +175,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t /* Informs systemd about changed daemon state. This takes a number of - newline seperated environment-style variable assignments in a + newline separated environment-style variable assignments in a string. The following variables are known: READY=1 Tells systemd that daemon startup is finished (only @@ -250,6 +254,16 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_( */ int sd_booted(void) _sd_hidden_; +/* + Controls ongoing disk read-ahead operations during boot-up. The argument + must be a string, and either "cancel", "done" or "noreplay". + + cancel = terminate read-ahead data collection, drop collected information + done = terminate read-ahead data collection, keep collected information + noreplay = terminate read-ahead replay +*/ +int sd_readahead(const char *action); + #ifdef __cplusplus } #endif diff --git a/avahi-discover-standalone/Makefile.in b/avahi-discover-standalone/Makefile.in index a3f2641..d6d12b5 100644 --- a/avahi-discover-standalone/Makefile.in +++ b/avahi-discover-standalone/Makefile.in @@ -309,6 +309,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -381,7 +383,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-dnsconfd/Makefile.in b/avahi-dnsconfd/Makefile.in index ebf7da3..e9742ce 100644 --- a/avahi-dnsconfd/Makefile.in +++ b/avahi-dnsconfd/Makefile.in @@ -294,6 +294,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -366,7 +368,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-glib/Makefile.in b/avahi-glib/Makefile.in index 5d0c611..5987fec 100644 --- a/avahi-glib/Makefile.in +++ b/avahi-glib/Makefile.in @@ -315,6 +315,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -387,7 +389,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-gobject/AvahiCore-0.6.gir b/avahi-gobject/AvahiCore-0.6.gir index 8b25fc1..5d7f68b 100644 --- a/avahi-gobject/AvahiCore-0.6.gir +++ b/avahi-gobject/AvahiCore-0.6.gir @@ -1,10 +1,12 @@ <?xml version="1.0"?> -<repository version="1.0" +<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> <namespace name="AvahiCore" version="0.6" shared-library="avahi-core"> - <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/> + <alias name="IfIndex" c:type="AvahiIfIndex"> + <type name="gint" c:type="int"/> + </alias> <enumeration name="Protocol" c:type="AvahiProtocol"> <member name="inet" value="0" diff --git a/avahi-gobject/Makefile.in b/avahi-gobject/Makefile.in index bb875ab..24f6be6 100644 --- a/avahi-gobject/Makefile.in +++ b/avahi-gobject/Makefile.in @@ -323,6 +323,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -395,7 +397,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-gobject/ga-entry-group.c b/avahi-gobject/ga-entry-group.c index 23e8ec3..101acbf 100644 --- a/avahi-gobject/ga-entry-group.c +++ b/avahi-gobject/ga-entry-group.c @@ -185,7 +185,7 @@ static void _free_service(gpointer data) { static GQuark detail_for_state(AvahiEntryGroupState state) { static struct { - AvahiClientState state; + AvahiEntryGroupState state; const gchar *name; GQuark quark; } states[] = { diff --git a/avahi-python/Makefile.in b/avahi-python/Makefile.in index b6beebd..02d4139 100644 --- a/avahi-python/Makefile.in +++ b/avahi-python/Makefile.in @@ -292,6 +292,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -364,7 +366,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-python/avahi-discover/Makefile.in b/avahi-python/avahi-discover/Makefile.in index 35a303f..d7c04ba 100644 --- a/avahi-python/avahi-discover/Makefile.in +++ b/avahi-python/avahi-discover/Makefile.in @@ -268,6 +268,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -340,7 +342,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-python/avahi/Makefile.in b/avahi-python/avahi/Makefile.in index fc0bb8a..54082a5 100644 --- a/avahi-python/avahi/Makefile.in +++ b/avahi-python/avahi/Makefile.in @@ -256,6 +256,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -328,7 +330,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-qt/Makefile.in b/avahi-qt/Makefile.in index c5840e6..68a2f9d 100644 --- a/avahi-qt/Makefile.in +++ b/avahi-qt/Makefile.in @@ -319,6 +319,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -391,7 +393,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-sharp/Makefile.in b/avahi-sharp/Makefile.in index a3374f2..1fdbd97 100644 --- a/avahi-sharp/Makefile.in +++ b/avahi-sharp/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-ui-sharp/Makefile.in b/avahi-ui-sharp/Makefile.in index 1ea0b50..a36bdbe 100644 --- a/avahi-ui-sharp/Makefile.in +++ b/avahi-ui-sharp/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-ui/Makefile.in b/avahi-ui/Makefile.in index 53d38d9..1a355ec 100644 --- a/avahi-ui/Makefile.in +++ b/avahi-ui/Makefile.in @@ -359,6 +359,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -431,7 +433,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c index 62ccd18..2569ba0 100644 --- a/avahi-ui/avahi-ui.c +++ b/avahi-ui/avahi-ui.c @@ -254,11 +254,13 @@ GtkWidget *aui_service_dialog_new_valist( const gchar *button_text; gint dr; - GtkWidget *w = GTK_WIDGET(g_object_new( + GtkWidget *w = (GtkWidget*)g_object_new( AUI_TYPE_SERVICE_DIALOG, +#if !GTK_CHECK_VERSION (2,21,8) "has-separator", FALSE, +#endif "title", title, - NULL)); + NULL); if (parent) gtk_window_set_transient_for(GTK_WINDOW(w), parent); @@ -985,7 +987,9 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user p->domain_dialog = gtk_dialog_new(); gtk_container_set_border_width(GTK_CONTAINER(p->domain_dialog), 5); gtk_window_set_title(GTK_WINDOW(p->domain_dialog), _("Change domain")); +#if !GTK_CHECK_VERSION(2,21,8) gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE); +#endif vbox = gtk_vbox_new(FALSE, 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); diff --git a/avahi-utils/Makefile.in b/avahi-utils/Makefile.in index 6acc509..300a8b0 100644 --- a/avahi-utils/Makefile.in +++ b/avahi-utils/Makefile.in @@ -321,6 +321,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -393,7 +395,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/common/ChangeLog b/common/ChangeLog index e68f2c6..8e65e69 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,12 +1,12 @@ -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> +2010-10-04 gettextize <bug-gnu-gettext@gnu.org> - * gettext.m4: New file, from gettext-0.17. - * iconv.m4: New file, from gettext-0.17. - * lib-ld.m4: New file, from gettext-0.17. - * lib-link.m4: New file, from gettext-0.17. - * lib-prefix.m4: New file, from gettext-0.17. - * nls.m4: New file, from gettext-0.17. - * po.m4: New file, from gettext-0.17. - * progtest.m4: New file, from gettext-0.17. + * gettext.m4: New file, from gettext-0.18.1. + * iconv.m4: New file, from gettext-0.18.1. + * lib-ld.m4: New file, from gettext-0.18.1. + * lib-link.m4: New file, from gettext-0.18.1. + * lib-prefix.m4: New file, from gettext-0.18.1. + * nls.m4: New file, from gettext-0.18.1. + * po.m4: New file, from gettext-0.18.1. + * progtest.m4: New file, from gettext-0.18.1. * Makefile.am (EXTRA_DIST): Add the new files. diff --git a/common/Makefile.in b/common/Makefile.in index 03be104..c6b757c 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -228,6 +228,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -300,7 +302,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/common/gettext.m4 b/common/gettext.m4 index c9ae1f7..f84e6a5 100644 --- a/common/gettext.m4 +++ b/common/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) @@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + 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) + 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 @@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + 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= @@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + 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) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) diff --git a/common/iconv.m4 b/common/iconv.m4 index 66bc76f..e2041b9 100644 --- a/common/iconv.m4 +++ b/common/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. +# iconv.m4 serial 11 (gettext-0.18.1) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ + 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 <stdlib.h> @@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ - dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" @@ -87,6 +87,25 @@ int main () return 1; } } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } #if 0 /* This bug could be worked around by the caller. */ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ { @@ -134,7 +153,7 @@ int main () am_func_iconv=no am_cv_lib_iconv=no fi if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then @@ -147,16 +166,31 @@ int main () LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])) +gl_iconv_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_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include <stdlib.h> #include <iconv.h> @@ -169,12 +203,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [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, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff --git a/common/lib-ld.m4 b/common/lib-ld.m4 index 96c4e2c..ebb3052 100644 --- a/common/lib-ld.m4 +++ b/common/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ 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, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld dnl From libtool-1.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-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 @@ -59,7 +59,7 @@ if test "$GCC" = yes; then # 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%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +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 @@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD, # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -101,9 +101,9 @@ else fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff --git a/common/lib-link.m4 b/common/lib-link.m4 index e3d26fc..c73bd8e 100644 --- a/common/lib-link.m4 +++ b/common/lib-link.m4 @@ -1,12 +1,12 @@ -# lib-link.m4 serial 13 (gettext-0.17) -dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.54) +AC_PREREQ([2.54]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. @@ -18,9 +18,9 @@ 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___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([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" @@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS], 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]) + popdef([NAME]) + popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) 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 the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and 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. dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname @@ -57,9 +58,9 @@ 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___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], 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]) + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) 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_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else @@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) AC_SUBST([LIB]NAME[_PREFIX]) - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) dnl Determine the platform dependent parameters needed to use rpath: @@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH], 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, [ + 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 @@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH], acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + 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. @@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) 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]N_A_M_E[-prefix], -[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME= INC[]NAME= LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -327,7 +372,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 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/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -415,7 +462,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -476,9 +532,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 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/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -609,6 +667,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -654,7 +717,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -663,7 +727,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; diff --git a/common/lib-prefix.m4 b/common/lib-prefix.m4 index a8684e1..1601cea 100644 --- a/common/lib-prefix.m4 +++ b/common/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff --git a/common/libtool.m4 b/common/libtool.m4 index 671cde1..8c99a62 100644 --- a/common/libtool.m4 +++ b/common/libtool.m4 @@ -1,7 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,7 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 56 LT_INIT +# serial 57 LT_INIT # LT_PREREQ(VERSION) @@ -66,6 +68,7 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ]) @@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -179,7 +187,6 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -193,23 +200,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -250,6 +240,28 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -408,7 +420,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -418,7 +430,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -517,12 +529,20 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -533,9 +553,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -543,16 +563,38 @@ for var in lt_decl_all_varnames([[ \ esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - _LT_OUTPUT_LIBTOOL_INIT ]) +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -562,20 +604,11 @@ _LT_OUTPUT_LIBTOOL_INIT AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 +lt_cl_silent=false exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -601,7 +634,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -646,15 +679,13 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) ])# LT_OUTPUT @@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1041,170 +1103,65 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_SHELL_INIT +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -[$]* -_LT_EOF - exit 0 + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -AC_SUBST(lt_ECHO) -]) _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], - [An echo program that does not interpret backslashes]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ])# _LT_PROG_ECHO_BACKSLASH @@ -1236,7 +1193,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1388,10 +1345,19 @@ if test -n "$RANLIB"; then esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1416,15 +1382,15 @@ AC_CACHE_CHECK([$1], [$2], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1464,7 +1430,7 @@ AC_CACHE_CHECK([$1], [$2], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1527,6 +1493,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1591,8 +1562,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1643,7 +1614,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line __oline__ "configure" +[#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1684,7 +1655,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1693,7 +1670,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -1869,16 +1850,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2037,6 +2018,7 @@ m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2045,16 +2027,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2067,7 +2056,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2087,7 +2076,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2175,7 +2170,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2228,23 +2223,12 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -2344,6 +2328,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -2386,8 +2383,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[[3-9]]*) @@ -2445,7 +2444,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -2454,16 +2453,21 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2475,8 +2479,9 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2708,6 +2713,8 @@ _LT_DECL([], [library_names_spec], [1], The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -2820,6 +2827,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -2949,8 +2957,8 @@ case $host_os in fi ;; esac -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_DECL([], [reload_cmds], [2])dnl +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_TAGDECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3002,16 +3010,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3041,6 +3051,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3049,11 +3063,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3075,7 +3089,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3217,7 +3231,19 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3230,13 +3256,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3259,7 +3285,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3287,7 +3313,12 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3304,6 +3335,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3429,7 +3461,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3591,6 +3623,11 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3696,7 +3733,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3729,8 +3766,8 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -3792,7 +3829,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -3896,6 +3933,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -3938,6 +3981,13 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -3980,7 +4030,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4001,7 +4051,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4013,25 +4063,25 @@ m4_if([$1], [CXX], [ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; esac ;; @@ -4063,7 +4113,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4173,8 +4223,10 @@ m4_if([$1], [CXX], [ aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4252,7 +4304,33 @@ dnl Note also adjust exclude_expsyms for C++ above. esac _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4270,6 +4348,7 @@ dnl Note also adjust exclude_expsyms for C++ above. fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4285,11 +4364,12 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -4325,6 +4405,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4346,6 +4427,11 @@ _LT_EOF fi ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4361,7 +4447,7 @@ _LT_EOF _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4375,11 +4461,12 @@ _LT_EOF tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4390,13 +4477,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4412,17 +4503,17 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4543,8 +4634,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -4633,7 +4726,7 @@ _LT_EOF # empty executable. _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -4648,8 +4741,13 @@ _LT_EOF # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -4688,7 +4786,7 @@ _LT_EOF # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. @@ -4755,7 +4853,7 @@ _LT_EOF ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -4774,7 +4872,7 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -4795,7 +4893,14 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi @@ -4823,19 +4928,19 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" AC_LINK_IFELSE(int foo(void) {}, - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ) LDFLAGS="$save_LDFLAGS" else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4897,17 +5002,17 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -4917,13 +5022,13 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5114,36 +5219,38 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) ;; esac fi @@ -5313,37 +5420,21 @@ CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG -# _LT_PROG_CXX -# ------------ -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -# compiler, we have our own version here. -m4_defun([_LT_PROG_CXX], -[ -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -AC_PROG_CXX -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_CXX - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_CXX], []) - - # _LT_LANG_CXX_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write # the compiler configuration to `libtool'. m4_defun([_LT_LANG_CXX_CONFIG], -[AC_REQUIRE([_LT_PROG_CXX])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5365,6 +5456,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5467,7 +5560,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -5579,7 +5672,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5594,8 +5687,13 @@ if test "$_lt_caught_CXX_error" != yes; then # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -5628,6 +5726,7 @@ if test "$_lt_caught_CXX_error" != yes; then # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5688,6 +5787,11 @@ if test "$_lt_caught_CXX_error" != yes; then gnu*) ;; + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -5712,7 +5816,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5777,7 +5881,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -5820,7 +5924,7 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -5831,9 +5935,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -5844,7 +5948,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -5862,7 +5966,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5899,26 +6003,26 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -5926,7 +6030,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -5945,9 +6049,9 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5967,13 +6071,13 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6042,7 +6146,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6077,15 +6181,15 @@ if test "$_lt_caught_CXX_error" != yes; then case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6101,17 +6205,17 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6121,7 +6225,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6157,7 +6261,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6178,7 +6282,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6205,7 +6309,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6216,7 +6320,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6270,6 +6374,10 @@ if test "$_lt_caught_CXX_error" != yes; then CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6516,7 +6624,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -6560,32 +6668,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], ])# _LT_SYS_HIDDEN_LIBDEPS -# _LT_PROG_F77 -# ------------ -# Since AC_PROG_F77 is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_F77], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -AC_PROG_F77 -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_F77 - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_F77], []) - - # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_REQUIRE([_LT_PROG_F77])dnl -AC_LANG_PUSH(Fortran 77) +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6604,6 +6696,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6703,32 +6797,17 @@ AC_LANG_POP ])# _LT_LANG_F77_CONFIG -# _LT_PROG_FC -# ----------- -# Since AC_PROG_FC is broken, in that it returns the empty string -# if there is no fortran compiler, we have our own version here. -m4_defun([_LT_PROG_FC], -[ -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -AC_PROG_FC -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi -popdef([AC_MSG_ERROR]) -])# _LT_PROG_FC - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([_LT_PROG_FC], []) - - # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_REQUIRE([_LT_PROG_FC])dnl -AC_LANG_PUSH(Fortran) +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -6747,6 +6826,8 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -6892,6 +6973,8 @@ _LT_CC_BASENAME([$compiler]) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7259,7 +7342,7 @@ _LT_EOF func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -7270,7 +7353,7 @@ func_dirname () # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } dnl func_dirname_and_basename @@ -7286,10 +7369,8 @@ dnl so there is no need for it here. func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -7300,20 +7381,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//' # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` } # func_arith arithmetic-term... diff --git a/common/ltoptions.m4 b/common/ltoptions.m4 index 34151a3..17cfd51 100644 --- a/common/ltoptions.m4 +++ b/common/ltoptions.m4 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ case $host in esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], diff --git a/common/ltversion.m4 b/common/ltversion.m4 index f3c5309..93fc771 100644 --- a/common/ltversion.m4 +++ b/common/ltversion.m4 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3175 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_VERSION], [2.2.10]) +m4_define([LT_PACKAGE_REVISION], [1.3175]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6b' -macro_revision='1.3017' +[macro_version='2.2.10' +macro_revision='1.3175' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/common/lt~obsolete.m4 b/common/lt~obsolete.m4 index 637bb20..c573da9 100644 --- a/common/lt~obsolete.m4 +++ b/common/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/common/nls.m4 b/common/nls.m4 index 7967cc2..003704c 100644 --- a/common/nls.m4 +++ b/common/nls.m4 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff --git a/common/po.m4 b/common/po.m4 index 0734762..47f36a4 100644 --- a/common/po.m4 +++ b/common/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl diff --git a/common/progtest.m4 b/common/progtest.m4 index a56365c..2d804ac 100644 --- a/common/progtest.m4 +++ b/common/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ rm -f conf$$.file # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff --git a/config.rpath b/config.rpath index c547c68..17298f2 100755 --- a/config.rpath +++ b/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2007 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -47,7 +47,7 @@ for cc_temp in $CC""; do done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ else ;; esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -76,7 +76,13 @@ else ;; linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -124,7 +130,7 @@ else esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +138,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -254,7 +260,7 @@ else hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +270,7 @@ else # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -326,7 +332,7 @@ else ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -494,7 +500,7 @@ else fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -505,7 +511,7 @@ case "$host_os" in aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) @@ -517,7 +523,7 @@ case "$host_os" in bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for avahi 0.6.27. +# Generated by GNU Autoconf 2.66 for avahi 0.6.28. # # Report bugs to <avahi (at) lists (dot) freedesktop (dot) org>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -173,7 +173,15 @@ test x\$exitcode = x0 || exit 1" as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" +test \$(( 1 + 1 )) = 2 || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -319,7 +327,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +367,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -528,161 +536,14 @@ 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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -ECHO=${lt_ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<_LT_EOF -$* -_LT_EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi - - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo - fi - fi - fi - fi - fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -701,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='avahi' PACKAGE_TARNAME='avahi' -PACKAGE_VERSION='0.6.27' -PACKAGE_STRING='avahi 0.6.27' +PACKAGE_VERSION='0.6.28' +PACKAGE_STRING='avahi 0.6.28' PACKAGE_BUGREPORT='avahi (at) lists (dot) freedesktop (dot) org' PACKAGE_URL='' @@ -900,6 +761,8 @@ HAVE_GLIB_FALSE HAVE_GLIB_TRUE GLIB20_LIBS GLIB20_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG have_pkg_config avahilocaledir @@ -995,7 +858,6 @@ OTOOL LIPO NMEDIT DSYMUTIL -lt_ECHO RANLIB AR OBJDUMP @@ -1186,6 +1048,8 @@ CCC CPP CXXCPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR GLIB20_CFLAGS GLIB20_LIBS GOBJECT_CFLAGS @@ -1313,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1339,7 +1203,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1543,7 +1407,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1559,7 +1423,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1589,8 +1453,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1598,7 +1462,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1616,13 +1480,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1645,7 +1509,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1659,8 +1523,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1675,9 +1539,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1716,11 +1580,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1746,7 +1610,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures avahi 0.6.27 to adapt to many kinds of systems. +\`configure' configures avahi 0.6.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1760,7 +1624,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1816,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of avahi 0.6.27:";; + short | recursive ) echo "Configuration of avahi 0.6.28:";; esac cat <<\_ACEOF @@ -1917,6 +1781,10 @@ Some influential environment variables: CPP C preprocessor CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path GLIB20_CFLAGS C compiler flags for GLIB20, overriding pkg-config GLIB20_LIBS linker flags for GLIB20, overriding pkg-config @@ -2013,10 +1881,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -avahi configure 0.6.27 -generated by GNU Autoconf 2.65 +avahi configure 0.6.28 +generated by GNU Autoconf 2.66 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2148,10 +2016,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2210,17 +2078,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ----------------------------------------------------------- ## +( $as_echo "## ----------------------------------------------------------- ## ## Report this to avahi (at) lists (dot) freedesktop (dot) org ## -## ----------------------------------------------------------- ## -_ASBOX +## ----------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2284,7 +2150,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2360,7 +2226,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2511,7 +2377,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2556,15 +2422,18 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2573,8 +2442,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -2598,8 +2471,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by avahi $as_me 0.6.27, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by avahi $as_me 0.6.28, which was +generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2709,11 +2582,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2747,11 +2618,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2764,11 +2633,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2782,11 +2649,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2841,7 +2706,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2856,7 +2726,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2932,7 +2806,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2953,16 +2827,22 @@ am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3078,11 +2958,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -3104,7 +2984,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -3114,7 +2994,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -3352,7 +3232,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3360,7 +3240,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -3406,7 +3286,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3422,7 +3302,7 @@ fi # Define the identity of the package. PACKAGE='avahi' - VERSION='0.6.27' + VERSION='0.6.28' cat >>confdefs.h <<_ACEOF @@ -3551,17 +3431,17 @@ LIBAVAHI_COMMON_VERSION_INFO=8:2:5 LIBAVAHI_CORE_VERSION_INFO=7:0:0 -LIBAVAHI_CLIENT_VERSION_INFO=5:7:2 +LIBAVAHI_CLIENT_VERSION_INFO=5:8:2 LIBAVAHI_GLIB_VERSION_INFO=1:2:0 -LIBAVAHI_GOBJECT_VERSION_INFO=0:2:0 +LIBAVAHI_GOBJECT_VERSION_INFO=0:3:0 LIBAVAHI_QT3_VERSION_INFO=1:2:0 LIBAVAHI_QT4_VERSION_INFO=1:2:0 -LIBAVAHI_UI_VERSION_INFO=1:2:1 +LIBAVAHI_UI_VERSION_INFO=1:3:1 # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour @@ -3574,7 +3454,7 @@ HOWL_COMPAT_VERSION=0.9.8 # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -3585,16 +3465,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3619,7 +3499,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3627,7 +3507,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -4005,8 +3885,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4120,9 +4000,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -4164,8 +4043,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -4222,9 +4101,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -4275,8 +4154,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -5255,7 +5134,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5500,8 +5379,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5562,7 +5441,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -5628,7 +5507,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5760,8 +5639,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5959,8 +5837,8 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5985,7 +5863,7 @@ fi $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -5993,7 +5871,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -6061,7 +5939,7 @@ if test "${enable_stack_protector+set}" = set; then : enableval=$enable_stack_protector; case "${enableval}" in yes) enable_ssp=yes ;; no) enable_ssp=no ;; - *) as_fn_error "invalid value ${enableval} for --disable-stack-protector" "$LINENO" 5 ;; + *) as_fn_error $? "invalid value ${enableval} for --disable-stack-protector" "$LINENO" 5 ;; esac else enable_ssp=yes @@ -6269,8 +6147,8 @@ esac -macro_version='2.2.6b' -macro_revision='1.3017' +macro_version='2.2.10' +macro_revision='1.3175' @@ -6286,6 +6164,75 @@ macro_revision='1.3017' ltmain="$ac_aux_dir/ltmain.sh" +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if test "${ac_cv_path_SED+set}" = set; then : @@ -6343,7 +6290,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -6422,7 +6369,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -6538,7 +6485,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -6621,8 +6568,11 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$ac_tool_prefix"; then - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6666,7 +6616,7 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in "dumpbin -symbols" "link -dump -symbols" + for ac_prog in dumpbin "link -dump" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6721,6 +6671,15 @@ esac fi fi + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -6740,13 +6699,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6743: $ac_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6746: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6749: output\"" >&5) + (eval echo "\"\$as_me:$LINENO: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6792,6 +6751,11 @@ else lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -6856,8 +6820,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ - = "XX$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -7128,16 +7092,18 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc) +cegcc*) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -7167,6 +7133,10 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -7175,11 +7145,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -7201,7 +7171,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7617,6 +7587,18 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + @@ -7786,8 +7768,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then @@ -7940,7 +7922,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7943 "configure"' > conftest.$ac_ext + echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8652,6 +8634,38 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if test "${lt_cv_ld_force_load+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -8679,7 +8693,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":"; then + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -8702,530 +8716,6 @@ done -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - - # Set options @@ -9380,6 +8870,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + test -z "$LN_S" && LN_S="ln -s" @@ -9429,19 +8920,6 @@ _ACEOF - - - - - - - - - - - - - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -9454,23 +8932,6 @@ aix3*) ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - # Global variables: ofile=libtool can_build_shared=yes @@ -9499,7 +8960,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -9708,7 +9169,12 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } @@ -9728,15 +9194,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9731: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9735: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -9814,6 +9280,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fno-common' ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -9856,6 +9328,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-fPIC' ;; esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + lt_prog_compiler_pic='-Xcompiler -fPIC' + ;; + esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -9897,7 +9376,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9918,7 +9397,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - pgcc* | pgf77* | pgf90* | pgf95*) + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -9930,25 +9409,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 + *Sun\ F* | *Sun*Fortran*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_wl='' ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker + *Sun\ C*) + # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' + lt_prog_compiler_wl='-Wl,' ;; esac ;; @@ -9980,7 +9459,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95*) + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -10067,15 +9546,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10070: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10074: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -10123,7 +9602,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -10172,16 +9651,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10175: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10179: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -10227,16 +9706,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10234: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -10349,7 +9828,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie esac ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -10367,6 +9872,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -10382,11 +9888,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** Warning: the GNU linker, at least up to release 2.19, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. _LT_EOF fi @@ -10422,6 +9929,7 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -10443,6 +9951,11 @@ _LT_EOF fi ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -10458,7 +9971,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -10472,11 +9985,12 @@ _LT_EOF tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10487,13 +10001,17 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -10509,17 +10027,17 @@ _LT_EOF fi case $cc_basename in - xlf*) + xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= hardcode_libdir_flag_spec_ld='-rpath $libdir' - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10640,8 +10158,10 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -10759,7 +10279,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -10803,8 +10323,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -10843,7 +10368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -10859,7 +10384,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec='' + fi link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -10867,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -10933,7 +10462,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -10952,7 +10481,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then + if test "$GCC" = yes && test "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -10973,7 +10502,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if test "${lt_cv_prog_compiler__b+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + ;; esac fi @@ -11001,7 +10569,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -11012,15 +10580,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi int foo(void) {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -11082,17 +10650,17 @@ rm -f core conftest.err conftest.$ac_objext \ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -11102,13 +10670,13 @@ rm -f core conftest.err conftest.$ac_objext \ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11311,44 +10879,50 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac fi @@ -11519,16 +11093,23 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -11541,7 +11122,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -11561,7 +11142,13 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -11649,7 +11236,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -11702,23 +11289,12 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -11818,6 +11394,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -11860,8 +11449,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -11919,7 +11510,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -11928,12 +11519,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11946,13 +11542,17 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes + lt_cv_shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -11964,8 +11564,9 @@ rm -f core conftest.err conftest.$ac_objext \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12267,6 +11868,11 @@ fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= @@ -12597,7 +12203,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12600 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12638,7 +12244,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12647,7 +12259,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12693,7 +12309,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12696 "configure" +#line $LINENO "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12734,7 +12350,13 @@ else # endif #endif -void fnord() { int i=42;} +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +void fnord () __attribute__((visibility("default"))); +#endif + +void fnord () { int i=42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12743,7 +12365,11 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } /* dlclose (self); */ } else @@ -12900,6 +12526,145 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12926,6 +12691,8 @@ module_cmds_CXX= module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -13008,7 +12775,7 @@ $RM -r conftest* *) break;; esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` if test -n "$compiler"; then @@ -13108,7 +12875,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -13170,7 +12937,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -13312,7 +13079,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -13356,8 +13123,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -13390,6 +13162,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' allow_undefined_flag_CXX=unsupported always_export_symbols_CXX=no enable_shared_with_static_runtimes_CXX=yes @@ -13416,7 +13189,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else + whole_archive_flag_spec_CXX='' + fi link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -13424,7 +13201,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -13477,6 +13254,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi gnu*) ;; + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13501,7 +13283,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -13566,7 +13348,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes; then @@ -13609,7 +13391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13620,9 +13402,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13633,7 +13415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13651,7 +13433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13688,26 +13470,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 will use weak symbols + *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13715,7 +13497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13734,9 +13516,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; - xl*) + xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13756,13 +13538,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13831,7 +13613,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=echo + output_verbose_link_cmd=func_echo_all else ld_shlibs_CXX=no fi @@ -13866,15 +13648,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -13890,17 +13672,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -13910,7 +13692,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -13946,7 +13728,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -13967,7 +13749,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' + output_verbose_link_cmd='func_echo_all' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13994,7 +13776,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -14005,7 +13787,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -14059,6 +13841,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -14240,7 +14026,7 @@ linux*) solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -14356,6 +14142,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -14461,7 +14252,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14494,8 +14285,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -14557,7 +14348,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ;; solaris*) case $cc_basename in - CC*) + CC* | sunCC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -14649,15 +14440,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14652: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14656: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -14702,7 +14493,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -14748,16 +14539,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14755: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14800,16 +14591,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14803: $lt_compile\"" >&5) + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14807: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14864,8 +14655,10 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -14912,44 +14705,50 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac fi @@ -15106,7 +14905,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -15159,23 +14958,11 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' @@ -15274,6 +15061,19 @@ gnu*) hardcode_into_libs=yes ;; +haiku*) + version_type=linux + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. @@ -15316,8 +15116,10 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; interix[3-9]*) @@ -15375,7 +15177,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -15384,12 +15186,17 @@ linux* | k*bsd*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15402,13 +15209,17 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes + lt_cv_shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -15420,8 +15231,9 @@ rm -f core conftest.err conftest.$ac_objext \ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15672,6 +15484,8 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= @@ -15791,8 +15605,8 @@ $as_echo "$avahi_cv_sys_cxx_works" >&6; } if [ "x$avahi_cv_sys_cxx_works" = "xno" ]; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The C++ compiler does not work -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "The C++ compiler does not work +See \`config.log' for more details" "$LINENO" 5; } fi @@ -16286,7 +16100,7 @@ $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h : else acx_pthread_ok=no - as_fn_error "Missing POSIX Threads support" "$LINENO" 5 + as_fn_error $? "Missing POSIX Threads support" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -16531,7 +16345,7 @@ if test "${ac_cv_file__etc_lfs_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/lfs-release"; then ac_cv_file__etc_lfs_release=yes else @@ -16550,7 +16364,7 @@ if test "${ac_cv_file__etc_SuSE_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/SuSE-release"; then ac_cv_file__etc_SuSE_release=yes else @@ -16569,7 +16383,7 @@ if test "${ac_cv_file__etc_gentoo_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/gentoo-release"; then ac_cv_file__etc_gentoo_release=yes else @@ -16588,7 +16402,7 @@ if test "${ac_cv_file__etc_arch_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/arch-release"; then ac_cv_file__etc_arch_release=yes else @@ -16607,7 +16421,7 @@ if test "${ac_cv_file__etc_debian_version+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/debian_version"; then ac_cv_file__etc_debian_version=yes else @@ -16626,7 +16440,7 @@ if test "${ac_cv_file__etc_redhat_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/redhat-release"; then ac_cv_file__etc_redhat_release=yes else @@ -16645,7 +16459,7 @@ if test "${ac_cv_file__etc_mandriva_release+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/mandriva-release"; then ac_cv_file__etc_mandriva_release=yes else @@ -16664,7 +16478,7 @@ if test "${ac_cv_file__etc_slackware_version+set}" = set; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/etc/slackware-version"; then ac_cv_file__etc_slackware_version=yes else @@ -16692,10 +16506,10 @@ case $with_distro in $as_echo "$as_me: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&2;} ;; linux) - as_fn_error "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported." "$LINENO" 5 + as_fn_error $? "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported." "$LINENO" 5 ;; *) - as_fn_error "Your distribution (${with_distro}) is not yet supported, init scripts and D-Bus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check" "$LINENO" 5 + as_fn_error $? "Your distribution (${with_distro}) is not yet supported, init scripts and D-Bus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check" "$LINENO" 5 ;; esac @@ -16975,8 +16789,7 @@ for ac_header in arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stdlib.h s do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -17454,8 +17267,7 @@ for ac_header in sys/select.h sys/socket.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -17534,8 +17346,7 @@ for ac_func in gethostname memchr memmove memset mkdir select socket strchr strc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -18038,7 +17849,7 @@ $as_echo "$USE_NLS" >&6; } case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -18055,7 +17866,7 @@ $as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -18179,7 +17990,7 @@ fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -18461,13 +18272,13 @@ fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -18511,13 +18322,13 @@ fi if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -18530,7 +18341,7 @@ $as_echo_n "checking for XML::Parser... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -19335,11 +19146,15 @@ fi if test x"$have_pkg_config" = "xno"; then - as_fn_error "pkg-config is required to install this program" "$LINENO" 5 + as_fn_error $? "pkg-config is required to install this program" "$LINENO" 5 fi + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -19452,7 +19267,6 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } PKG_CONFIG="" fi - fi # @@ -19463,7 +19277,7 @@ if test "${enable_glib+set}" = set; then : enableval=$enable_glib; case "${enableval}" in yes) HAVE_GLIB=yes ;; no) HAVE_GLIB=no ;; - *) as_fn_error "bad value ${enableval} for --enable-glib" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-glib" "$LINENO" 5 ;; esac else HAVE_GLIB=yes @@ -19512,6 +19326,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19526,7 +19342,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GLIB20_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( glib-2.0 >= 2.4.0 ) were not met: + as_fn_error $? "Package requirements ( glib-2.0 >= 2.4.0 ) were not met: $GLIB20_PKG_ERRORS @@ -19535,12 +19351,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GLIB20_CFLAGS and GLIB20_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19549,13 +19367,14 @@ and GLIB20_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GLIB20_CFLAGS=$pkg_cv_GLIB20_CFLAGS GLIB20_LIBS=$pkg_cv_GLIB20_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -19577,7 +19396,7 @@ if test "${enable_gobject+set}" = set; then : enableval=$enable_gobject; case "${enableval}" in yes) HAVE_GOBJECT=yes ;; no) HAVE_GOBJECT=no ;; - *) as_fn_error "bad value ${enableval} for --enable-gobject" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-gobject" "$LINENO" 5 ;; esac else HAVE_GOBJECT=yes @@ -19626,6 +19445,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19640,7 +19461,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GOBJECT_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( glib-2.0 >= 2.4.0 gobject-2.0 ) were not met: + as_fn_error $? "Package requirements ( glib-2.0 >= 2.4.0 gobject-2.0 ) were not met: $GOBJECT_PKG_ERRORS @@ -19649,12 +19470,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GOBJECT_CFLAGS and GOBJECT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19663,13 +19486,14 @@ and GOBJECT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -19713,23 +19537,23 @@ $as_echo_n "checking for gobject-introspection... " >&6; } test $ac_status = 0; }; then : else - as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5 + as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then found_introspection=yes else - as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build avahi" "$LINENO" 5 + as_fn_error $? "You need to have gobject-introspection >= 0.9.5 installed to build avahi" "$LINENO" 5 fi ;; #( auto) : if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.5") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then @@ -19739,7 +19563,7 @@ else fi ;; #( *) : - as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 @@ -19788,7 +19612,7 @@ if test "${enable_qt3+set}" = set; then : enableval=$enable_qt3; case "${enableval}" in yes) HAVE_QT3=yes ;; no) HAVE_QT3=no ;; - *) as_fn_error "bad value ${enableval} for --enable-qt3" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-qt3" "$LINENO" 5 ;; esac else HAVE_QT3=yes @@ -19837,6 +19661,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19851,7 +19677,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$QT3_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( qt-mt >= 3.0.0 ) were not met: + as_fn_error $? "Package requirements ( qt-mt >= 3.0.0 ) were not met: $QT3_PKG_ERRORS @@ -19860,12 +19686,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables QT3_CFLAGS and QT3_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19874,13 +19702,14 @@ and QT3_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else QT3_CFLAGS=$pkg_cv_QT3_CFLAGS QT3_LIBS=$pkg_cv_QT3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -19932,7 +19761,7 @@ done test -n "$MOC_QT3" || MOC_QT3="no" if test "$MOC_QT3" = no; then - as_fn_error "Could not find QT3 moc" "$LINENO" 5 + as_fn_error $? "Could not find QT3 moc" "$LINENO" 5 fi fi @@ -19953,7 +19782,7 @@ if test "${enable_qt4+set}" = set; then : enableval=$enable_qt4; case "${enableval}" in yes) HAVE_QT4=yes ;; no) HAVE_QT4=no ;; - *) as_fn_error "bad value ${enableval} for --enable-qt4" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-qt4" "$LINENO" 5 ;; esac else HAVE_QT4=yes @@ -20002,6 +19831,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20016,7 +19847,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$QT4_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( QtCore >= 4.0.0 ) were not met: + as_fn_error $? "Package requirements ( QtCore >= 4.0.0 ) were not met: $QT4_PKG_ERRORS @@ -20025,12 +19856,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables QT4_CFLAGS and QT4_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20039,13 +19872,14 @@ and QT4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else QT4_CFLAGS=$pkg_cv_QT4_CFLAGS QT4_LIBS=$pkg_cv_QT4_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -20097,7 +19931,7 @@ done test -n "$MOC_QT4" || MOC_QT4="no" if test "$MOC_QT4" = no; then - as_fn_error "Could not find QT4 moc" "$LINENO" 5 + as_fn_error $? "Could not find QT4 moc" "$LINENO" 5 fi fi @@ -20118,7 +19952,7 @@ if test "${enable_gtk+set}" = set; then : enableval=$enable_gtk; case "${enableval}" in yes) HAVE_GTK=yes ;; no) HAVE_GTK=no ;; - *) as_fn_error "bad value ${enableval} for --enable-gtk" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-gtk" "$LINENO" 5 ;; esac else HAVE_GTK=yes @@ -20168,6 +20002,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20182,7 +20018,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTK20_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( gtk+-2.0 >= 2.14.0 ) were not met: + as_fn_error $? "Package requirements ( gtk+-2.0 >= 2.14.0 ) were not met: $GTK20_PKG_ERRORS @@ -20191,12 +20027,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GTK20_CFLAGS and GTK20_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20205,13 +20043,14 @@ and GTK20_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GTK20_CFLAGS=$pkg_cv_GTK20_CFLAGS GTK20_LIBS=$pkg_cv_GTK20_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -20233,7 +20072,7 @@ if test "${enable_gtk3+set}" = set; then : enableval=$enable_gtk3; case "${enableval}" in yes) HAVE_GTK3=yes ;; no) HAVE_GTK3=no ;; - *) as_fn_error "bad value ${enableval} for --enable-gtk3" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-gtk3" "$LINENO" 5 ;; esac else HAVE_GTK3=yes @@ -20283,6 +20122,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20297,7 +20138,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTK30_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( gtk+-3.0 ) were not met: + as_fn_error $? "Package requirements ( gtk+-3.0 ) were not met: $GTK30_PKG_ERRORS @@ -20306,12 +20147,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GTK30_CFLAGS and GTK30_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20320,13 +20163,14 @@ and GTK30_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else GTK30_CFLAGS=$pkg_cv_GTK30_CFLAGS GTK30_LIBS=$pkg_cv_GTK30_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -20357,7 +20201,7 @@ if test "${enable_dbus+set}" = set; then : enableval=$enable_dbus; case "${enableval}" in yes) HAVE_DBUS=yes ;; no) HAVE_DBUS=no ;; - *) as_fn_error "bad value ${enableval} for --enable-dbus" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-dbus" "$LINENO" 5 ;; esac else HAVE_DBUS=yes @@ -20422,6 +20266,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20436,7 +20282,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( dbus-1 >= 0.34 ) were not met: + as_fn_error $? "Package requirements ( dbus-1 >= 0.34 ) were not met: $DBUS_PKG_ERRORS @@ -20445,12 +20291,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20459,13 +20307,14 @@ and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -20538,8 +20387,7 @@ $as_echo "#define HAVE_DBUS 1" >>confdefs.h do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -20687,22 +20535,22 @@ if test "x$with_xml" = "xnone"; then elif test "x$with_xml" = "xexpat"; then use_expat=true if ! $have_expat ; then - as_fn_error "*** libexpat requested, but not found ***" "$LINENO" 5 + as_fn_error $? "*** libexpat requested, but not found ***" "$LINENO" 5 fi elif test "x$with_xml" = "xbsdxml"; then use_bsdxml=true if ! $have_bsdxml ; then - as_fn_error "*** libbsdxml requested, but not found ***" "$LINENO" 5 + as_fn_error $? "*** libbsdxml requested, but not found ***" "$LINENO" 5 fi elif test "x$with_xml" != "x"; then - as_fn_error "*** unknown with-xml option ***" "$LINENO" 5 + as_fn_error $? "*** unknown with-xml option ***" "$LINENO" 5 else if $have_expat ; then use_expat=true elif $have_bsdxml ; then use_bsdxml=true else - as_fn_error "*** neither libexpat not libbsdxml could be found ***" "$LINENO" 5 + as_fn_error $? "*** neither libexpat not libbsdxml could be found ***" "$LINENO" 5 fi fi @@ -20743,7 +20591,7 @@ if test "${enable_dbm+set}" = set; then : enableval=$enable_dbm; case "${enableval}" in yes) HAVE_DBM=yes ;; no) HAVE_DBM=no ;; - *) as_fn_error "bad value ${enableval} for --enable-dbm" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-dbm" "$LINENO" 5 ;; esac else HAVE_DBM=no @@ -20755,7 +20603,7 @@ if test "${enable_gdbm+set}" = set; then : enableval=$enable_gdbm; case "${enableval}" in yes) HAVE_GDBM=yes ;; no) HAVE_GDBM=no ;; - *) as_fn_error "bad value ${enableval} for --disable-gdbm" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --disable-gdbm" "$LINENO" 5 ;; esac else HAVE_GDBM=yes @@ -20764,7 +20612,7 @@ fi if test "x$HAVE_GDBM" = "xyes" ; then if test "x$HAVE_DBM" = "xyes" ; then - as_fn_error "*** --enable-gdbm and --enable-dbm both specified ***" "$LINENO" 5 + as_fn_error $? "*** --enable-gdbm and --enable-dbm both specified ***" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5 $as_echo_n "checking for gdbm_open in -lgdbm... " >&6; } @@ -20823,7 +20671,7 @@ fi if ! $have_gdbm ; then - as_fn_error "*** libgdbm not found ***" "$LINENO" 5 + as_fn_error $? "*** libgdbm not found ***" "$LINENO" 5 fi $as_echo "#define HAVE_GDBM /**/" >>confdefs.h @@ -20846,7 +20694,7 @@ done if ! $have_dbm ; then - as_fn_error "*** dbm not found ***" "$LINENO" 5 + as_fn_error $? "*** dbm not found ***" "$LINENO" 5 fi $as_echo "#define HAVE_DBM /**/" >>confdefs.h @@ -20878,7 +20726,7 @@ if test "${enable_libdaemon+set}" = set; then : enableval=$enable_libdaemon; case "${enableval}" in yes) HAVE_LIBDAEMON=yes ;; no) HAVE_LIBDAEMON=no ;; - *) as_fn_error "bad value ${enableval} for --enable-libdaemon" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-libdaemon" "$LINENO" 5 ;; esac else HAVE_LIBDAEMON=yes @@ -20895,12 +20743,12 @@ if test -n "$LIBDAEMON_CFLAGS"; then pkg_cv_LIBDAEMON_CFLAGS="$LIBDAEMON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libdaemon >= 0.11 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " libdaemon >= 0.11 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libdaemon >= 0.14 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " libdaemon >= 0.14 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBDAEMON_CFLAGS=`$PKG_CONFIG --cflags " libdaemon >= 0.11 " 2>/dev/null` + pkg_cv_LIBDAEMON_CFLAGS=`$PKG_CONFIG --cflags " libdaemon >= 0.14 " 2>/dev/null` else pkg_failed=yes fi @@ -20911,12 +20759,12 @@ if test -n "$LIBDAEMON_LIBS"; then pkg_cv_LIBDAEMON_LIBS="$LIBDAEMON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libdaemon >= 0.11 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " libdaemon >= 0.11 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libdaemon >= 0.14 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " libdaemon >= 0.14 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBDAEMON_LIBS=`$PKG_CONFIG --libs " libdaemon >= 0.11 " 2>/dev/null` + pkg_cv_LIBDAEMON_LIBS=`$PKG_CONFIG --libs " libdaemon >= 0.14 " 2>/dev/null` else pkg_failed=yes fi @@ -20927,6 +20775,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20934,14 +20784,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libdaemon >= 0.11 " 2>&1` + LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libdaemon >= 0.14 " 2>&1` else - LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors " libdaemon >= 0.11 " 2>&1` + LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors " libdaemon >= 0.14 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBDAEMON_PKG_ERRORS" >&5 - as_fn_error "Package requirements ( libdaemon >= 0.11 ) were not met: + as_fn_error $? "Package requirements ( libdaemon >= 0.14 ) were not met: $LIBDAEMON_PKG_ERRORS @@ -20950,12 +20800,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBDAEMON_CFLAGS and LIBDAEMON_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20964,13 +20816,14 @@ and LIBDAEMON_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else LIBDAEMON_CFLAGS=$pkg_cv_LIBDAEMON_CFLAGS LIBDAEMON_LIBS=$pkg_cv_LIBDAEMON_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -20992,7 +20845,7 @@ if test "${enable_python+set}" = set; then : enableval=$enable_python; case "${enableval}" in yes) HAVE_PYTHON=yes ;; no) HAVE_PYTHON=no ;; - *) as_fn_error "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; esac else HAVE_PYTHON=yes @@ -21028,7 +20881,7 @@ sys.exit(sys.hexversion < minverhex)" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error "too old" "$LINENO" 5 + as_fn_error $? "too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -21112,7 +20965,7 @@ fi if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else @@ -21235,7 +21088,7 @@ if test "${enable_pygtk+set}" = set; then : enableval=$enable_pygtk; case "${enableval}" in yes) HAVE_PYGTK=yes ;; no) HAVE_PYGTK=no ;; - *) as_fn_error "bad value ${enableval} for --enable-pygtk" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-pygtk" "$LINENO" 5 ;; esac else HAVE_PYGTK=yes @@ -21247,7 +21100,7 @@ fi py_mod_var=`echo gtk'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gtk" >&5 $as_echo_n "checking for python module gtk... " >&6; } -if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${py_cv_mod_$py_mod_var+set}\"" = set; then : $as_echo_n "(cached) " >&6 else @@ -21276,7 +21129,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Could not find Python module gtk" "$LINENO" 5 + as_fn_error $? "Could not find Python module gtk" "$LINENO" 5 fi fi @@ -21288,7 +21141,7 @@ if test "${enable_python_dbus+set}" = set; then : enableval=$enable_python_dbus; case "${enableval}" in yes) HAVE_PYTHON_DBUS=yes ;; no) HAVE_PYTHON_DBUS=no ;; - *) as_fn_error "bad value ${enableval} for --enable-python-dbus" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python-dbus" "$LINENO" 5 ;; esac else HAVE_PYTHON_DBUS=yes @@ -21300,7 +21153,7 @@ fi py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5 $as_echo_n "checking for python module dbus... " >&6; } -if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${py_cv_mod_$py_mod_var+set}\"" = set; then : $as_echo_n "(cached) " >&6 else @@ -21329,7 +21182,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Could not find Python module dbus" "$LINENO" 5 + as_fn_error $? "Could not find Python module dbus" "$LINENO" 5 fi fi @@ -21338,7 +21191,7 @@ fi py_mod_var=`echo socket'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module socket" >&5 $as_echo_n "checking for python module socket... " >&6; } -if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${py_cv_mod_$py_mod_var+set}\"" = set; then : $as_echo_n "(cached) " >&6 else @@ -21367,7 +21220,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Could not find Python module socket" "$LINENO" 5 + as_fn_error $? "Could not find Python module socket" "$LINENO" 5 fi if test "x$HAVE_GDBM" = "xyes"; then @@ -21375,7 +21228,7 @@ fi py_mod_var=`echo gdbm'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gdbm" >&5 $as_echo_n "checking for python module gdbm... " >&6; } -if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${py_cv_mod_$py_mod_var+set}\"" = set; then : $as_echo_n "(cached) " >&6 else @@ -21404,7 +21257,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Could not find Python module gdbm" "$LINENO" 5 + as_fn_error $? "Could not find Python module gdbm" "$LINENO" 5 fi fi @@ -21413,7 +21266,7 @@ fi py_mod_var=`echo dbm'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbm" >&5 $as_echo_n "checking for python module dbm... " >&6; } -if { as_var=py_cv_mod_$py_mod_var; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${py_cv_mod_$py_mod_var+set}\"" = set; then : $as_echo_n "(cached) " >&6 else @@ -21442,7 +21295,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error "Could not find Python module dbm" "$LINENO" 5 + as_fn_error $? "Could not find Python module dbm" "$LINENO" 5 fi fi @@ -21483,7 +21336,7 @@ if test "${enable_mono+set}" = set; then : enableval=$enable_mono; case "${enableval}" in yes) HAVE_MONO=yes ;; no) HAVE_MONO=no ;; - *) as_fn_error "bad value ${enableval} for --enable-mono" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-mono" "$LINENO" 5 ;; esac else HAVE_MONO=yes @@ -21532,7 +21385,7 @@ fi if test "x$MCS" = "x" ; then - as_fn_error "Can not find \"mcs\" - The Mono C-Sharp Compiler) in your PATH" "$LINENO" 5 + as_fn_error $? "Can not find \"mcs\" - The Mono C-Sharp Compiler) in your PATH" "$LINENO" 5 fi # Extract the first word of "gacutil", so it can be a program name with args. @@ -21576,7 +21429,7 @@ fi if test "x$GACUTIL" = "x" ; then - as_fn_error "Can not find \"gacutil\" in your PATH" "$LINENO" 5 + as_fn_error $? "Can not find \"gacutil\" in your PATH" "$LINENO" 5 fi @@ -21601,7 +21454,7 @@ if test "${enable_monodoc+set}" = set; then : enableval=$enable_monodoc; case "${enableval}" in yes) HAVE_MONODOC=yes ;; no) HAVE_MONODOC=no ;; - *) as_fn_error "bad value ${enableval} for --enable-monodoc" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-monodoc" "$LINENO" 5 ;; esac else HAVE_MONODOC=yes @@ -21650,6 +21503,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21664,7 +21519,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$MONODOC_PKG_ERRORS" >&5 - as_fn_error "Package requirements (monodoc >= 1.1.8) were not met: + as_fn_error $? "Package requirements (monodoc >= 1.1.8) were not met: $MONODOC_PKG_ERRORS @@ -21673,12 +21528,14 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables MONODOC_CFLAGS and MONODOC_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -21687,13 +21544,14 @@ and MONODOC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } + else MONODOC_CFLAGS=$pkg_cv_MONODOC_CFLAGS MONODOC_LIBS=$pkg_cv_MONODOC_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc` @@ -21799,7 +21657,7 @@ if test "${enable_autoipd+set}" = set; then : enableval=$enable_autoipd; case "${enableval}" in yes) ENABLE_AUTOIPD=yes ;; no) ENABLE_AUTOIPD=no ;; - *) as_fn_error "bad value ${enableval} for --disable-autoipd" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --disable-autoipd" "$LINENO" 5 ;; esac else ENABLE_AUTOIPD=yes @@ -21974,7 +21832,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-doc" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-doc" "$LINENO" 5 ;; esac @@ -22241,7 +22099,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-dot requires doxygen-dot" "$LINENO" 5 +|| as_fn_error $? "doxygen-dot requires doxygen-dot" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22249,7 +22107,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-dot" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-dot" "$LINENO" 5 ;; esac @@ -22416,7 +22274,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-man requires doxygen-man" "$LINENO" 5 +|| as_fn_error $? "doxygen-man requires doxygen-man" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22424,7 +22282,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-man" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-man" "$LINENO" 5 ;; esac @@ -22484,7 +22342,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-rtf requires doxygen-rtf" "$LINENO" 5 +|| as_fn_error $? "doxygen-rtf requires doxygen-rtf" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22492,7 +22350,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-rtf" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-rtf" "$LINENO" 5 ;; esac @@ -22552,7 +22410,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-xml requires doxygen-xml" "$LINENO" 5 +|| as_fn_error $? "doxygen-xml requires doxygen-xml" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22560,7 +22418,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-xml" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-xml" "$LINENO" 5 ;; esac @@ -22620,7 +22478,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-chm requires doxygen-chm" "$LINENO" 5 +|| as_fn_error $? "doxygen-chm requires doxygen-chm" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22628,7 +22486,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-chm" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-chm" "$LINENO" 5 ;; esac @@ -22797,7 +22655,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_chm" = "1" \ -|| as_fn_error "doxygen-chi requires doxygen-chi" "$LINENO" 5 +|| as_fn_error $? "doxygen-chi requires doxygen-chi" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22805,7 +22663,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-chi" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-chi" "$LINENO" 5 ;; esac @@ -22865,10 +22723,10 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-html requires doxygen-html" "$LINENO" 5 +|| as_fn_error $? "doxygen-html requires doxygen-html" "$LINENO" 5 test "$DX_FLAG_chm" = "0" \ -|| as_fn_error "doxygen-html contradicts doxygen-html" "$LINENO" 5 +|| as_fn_error $? "doxygen-html contradicts doxygen-html" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22876,7 +22734,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-html" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-html" "$LINENO" 5 ;; esac @@ -22939,7 +22797,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-ps requires doxygen-ps" "$LINENO" 5 +|| as_fn_error $? "doxygen-ps requires doxygen-ps" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -22947,7 +22805,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-ps" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-ps" "$LINENO" 5 ;; esac @@ -23428,7 +23286,7 @@ y|Y|yes|Yes|YES) test "$DX_FLAG_doc" = "1" \ -|| as_fn_error "doxygen-pdf requires doxygen-pdf" "$LINENO" 5 +|| as_fn_error $? "doxygen-pdf requires doxygen-pdf" "$LINENO" 5 ;; #( n|N|no|No|NO) @@ -23436,7 +23294,7 @@ n|N|no|No|NO) ;; #( *) - as_fn_error "invalid value '$enableval' given to doxygen-pdf" "$LINENO" 5 + as_fn_error $? "invalid value '$enableval' given to doxygen-pdf" "$LINENO" 5 ;; esac @@ -23835,7 +23693,7 @@ a4wide|a4|letter|legal|executive) ;; #( *) - as_fn_error "unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" "$LINENO" 5 + as_fn_error $? "unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" "$LINENO" 5 ;; esac @@ -23858,7 +23716,7 @@ if test "${enable_core_docs+set}" = set; then : enableval=$enable_core_docs; case "${enableval}" in yes) ENABLE_CORE_DOCS=yes ;; no) ENABLE_CORE_DOCS=no ;; - *) as_fn_error "bad value ${enableval} for --enable-core-docs" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-core-docs" "$LINENO" 5 ;; esac else ENABLE_CORE_DOCS=no @@ -23882,7 +23740,7 @@ if test "${enable_manpages+set}" = set; then : enableval=$enable_manpages; case "${enableval}" in yes) manpages=yes ;; no) manpages=no ;; - *) as_fn_error "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --disable-manpages" "$LINENO" 5 ;; esac else manpages=yes @@ -23898,7 +23756,7 @@ if test "${enable_xmltoman+set}" = set; then : enableval=$enable_xmltoman; case "${enableval}" in yes) xmltoman=yes ;; no) xmltoman=no ;; - *) as_fn_error "bad value ${enableval} for --disable-xmltoman" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --disable-xmltoman" "$LINENO" 5 ;; esac else xmltoman=yes @@ -23948,7 +23806,7 @@ fi if test x$have_xmltoman = xno -o x$xmltoman = xno; then if ! test -e man/avahi-daemon.8 ; then - as_fn_error "*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman" "$LINENO" 5 + as_fn_error $? "*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman" "$LINENO" 5 exit 1 fi { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Not rebuilding man pages as xmltoman is not found ***" >&5 @@ -23981,7 +23839,7 @@ if test "${enable_tests+set}" = set; then : enableval=$enable_tests; case "${enableval}" in yes) ENABLE_TESTS=yes ;; no) ENABLE_TESTS=no ;; - *) as_fn_error "bad value ${enableval} for --enable-tests" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-tests" "$LINENO" 5 ;; esac else ENABLE_TESTS=no @@ -24005,7 +23863,7 @@ if test "${enable_compat_libdns_sd+set}" = set; then : enableval=$enable_compat_libdns_sd; case "${enableval}" in yes) ENABLE_COMPAT_LIBDNS_SD=yes ;; no) ENABLE_COMPAT_LIBDNS_SD=no ;; - *) as_fn_error "bad value ${enableval} for --enable-compat-libdns_sd" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-compat-libdns_sd" "$LINENO" 5 ;; esac else ENABLE_COMPAT_LIBDNS_SD=no @@ -24029,7 +23887,7 @@ if test "${enable_compat_howl+set}" = set; then : enableval=$enable_compat_howl; case "${enableval}" in yes) ENABLE_COMPAT_HOWL=yes ;; no) ENABLE_COMPAT_HOWL=no ;; - *) as_fn_error "bad value ${enableval} for --enable-compat-howl" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-compat-howl" "$LINENO" 5 ;; esac else ENABLE_COMPAT_HOWL=no @@ -24056,9 +23914,11 @@ else with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) fi -systemdsystemunitdir=$with_systemdsystemunitdir +if test "x$with_systemdsystemunitdir" != xno; then + systemdsystemunitdir=$with_systemdsystemunitdir - if test -n "$with_systemdsystemunitdir"; then +fi + if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then HAVE_SYSTEMD_TRUE= HAVE_SYSTEMD_FALSE='#' else @@ -24153,6 +24013,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -24176,95 +24037,91 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_NETLINK_TRUE}" && test -z "${HAVE_NETLINK_FALSE}"; then - as_fn_error "conditional \"HAVE_NETLINK\" was never defined. + as_fn_error $? "conditional \"HAVE_NETLINK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PF_ROUTE_TRUE}" && test -z "${HAVE_PF_ROUTE_FALSE}"; then - as_fn_error "conditional \"HAVE_PF_ROUTE\" was never defined. + as_fn_error $? "conditional \"HAVE_PF_ROUTE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_SYS_FILIO_H_TRUE}" && test -z "${HAVE_SYS_FILIO_H_FALSE}"; then - as_fn_error "conditional \"HAVE_SYS_FILIO_H\" was never defined. + as_fn_error $? "conditional \"HAVE_SYS_FILIO_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_SYS_SYSCTL_H_TRUE}" && test -z "${HAVE_SYS_SYSCTL_H_FALSE}"; then - as_fn_error "conditional \"HAVE_SYS_SYSCTL_H\" was never defined. + as_fn_error $? "conditional \"HAVE_SYS_SYSCTL_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_LFS_TRUE}" && test -z "${TARGET_LFS_FALSE}"; then - as_fn_error "conditional \"TARGET_LFS\" was never defined. + as_fn_error $? "conditional \"TARGET_LFS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_SUSE_TRUE}" && test -z "${TARGET_SUSE_FALSE}"; then - as_fn_error "conditional \"TARGET_SUSE\" was never defined. + as_fn_error $? "conditional \"TARGET_SUSE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_GENTOO_TRUE}" && test -z "${TARGET_GENTOO_FALSE}"; then - as_fn_error "conditional \"TARGET_GENTOO\" was never defined. + as_fn_error $? "conditional \"TARGET_GENTOO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_DEBIAN_TRUE}" && test -z "${TARGET_DEBIAN_FALSE}"; then - as_fn_error "conditional \"TARGET_DEBIAN\" was never defined. + as_fn_error $? "conditional \"TARGET_DEBIAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_ARCHLINUX_TRUE}" && test -z "${TARGET_ARCHLINUX_FALSE}"; then - as_fn_error "conditional \"TARGET_ARCHLINUX\" was never defined. + as_fn_error $? "conditional \"TARGET_ARCHLINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_FEDORA_TRUE}" && test -z "${TARGET_FEDORA_FALSE}"; then - as_fn_error "conditional \"TARGET_FEDORA\" was never defined. + as_fn_error $? "conditional \"TARGET_FEDORA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_MANDRIVA_TRUE}" && test -z "${TARGET_MANDRIVA_FALSE}"; then - as_fn_error "conditional \"TARGET_MANDRIVA\" was never defined. + as_fn_error $? "conditional \"TARGET_MANDRIVA\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_DARWIN_TRUE}" && test -z "${TARGET_DARWIN_FALSE}"; then - as_fn_error "conditional \"TARGET_DARWIN\" was never defined. + as_fn_error $? "conditional \"TARGET_DARWIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_NETBSD_TRUE}" && test -z "${TARGET_NETBSD_FALSE}"; then - as_fn_error "conditional \"TARGET_NETBSD\" was never defined. + as_fn_error $? "conditional \"TARGET_NETBSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_FREEBSD_TRUE}" && test -z "${TARGET_FREEBSD_FALSE}"; then - as_fn_error "conditional \"TARGET_FREEBSD\" was never defined. + as_fn_error $? "conditional \"TARGET_FREEBSD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${TARGET_SLACKWARE_TRUE}" && test -z "${TARGET_SLACKWARE_FALSE}"; then - as_fn_error "conditional \"TARGET_SLACKWARE\" was never defined. + as_fn_error $? "conditional \"TARGET_SLACKWARE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_CHROOT_TRUE}" && test -z "${ENABLE_CHROOT_FALSE}"; then - as_fn_error "conditional \"ENABLE_CHROOT\" was never defined. + as_fn_error $? "conditional \"ENABLE_CHROOT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_DLOPEN_TRUE}" && test -z "${HAVE_DLOPEN_FALSE}"; then - as_fn_error "conditional \"HAVE_DLOPEN\" was never defined. + as_fn_error $? "conditional \"HAVE_DLOPEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_INOTIFY_TRUE}" && test -z "${HAVE_INOTIFY_FALSE}"; then - as_fn_error "conditional \"HAVE_INOTIFY\" was never defined. + as_fn_error $? "conditional \"HAVE_INOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_KQUEUE_TRUE}" && test -z "${HAVE_KQUEUE_FALSE}"; then - as_fn_error "conditional \"HAVE_KQUEUE\" was never defined. + as_fn_error $? "conditional \"HAVE_KQUEUE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -24272,195 +24129,195 @@ fi if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then - as_fn_error "conditional \"HAVE_GLIB\" was never defined. + as_fn_error $? "conditional \"HAVE_GLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GOBJECT_TRUE}" && test -z "${HAVE_GOBJECT_FALSE}"; then - as_fn_error "conditional \"HAVE_GOBJECT\" was never defined. + as_fn_error $? "conditional \"HAVE_GOBJECT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then - as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined. + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_QT3_TRUE}" && test -z "${HAVE_QT3_FALSE}"; then - as_fn_error "conditional \"HAVE_QT3\" was never defined. + as_fn_error $? "conditional \"HAVE_QT3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_QT4_TRUE}" && test -z "${HAVE_QT4_FALSE}"; then - as_fn_error "conditional \"HAVE_QT4\" was never defined. + as_fn_error $? "conditional \"HAVE_QT4\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then - as_fn_error "conditional \"HAVE_GTK\" was never defined. + as_fn_error $? "conditional \"HAVE_GTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GTK3_TRUE}" && test -z "${HAVE_GTK3_FALSE}"; then - as_fn_error "conditional \"HAVE_GTK3\" was never defined. + as_fn_error $? "conditional \"HAVE_GTK3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GTK2OR3_TRUE}" && test -z "${HAVE_GTK2OR3_FALSE}"; then - as_fn_error "conditional \"HAVE_GTK2OR3\" was never defined. + as_fn_error $? "conditional \"HAVE_GTK2OR3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then - as_fn_error "conditional \"HAVE_DBUS\" was never defined. + as_fn_error $? "conditional \"HAVE_DBUS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_XML_TRUE}" && test -z "${HAVE_XML_FALSE}"; then - as_fn_error "conditional \"HAVE_XML\" was never defined. + as_fn_error $? "conditional \"HAVE_XML\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GDBM_TRUE}" && test -z "${HAVE_GDBM_FALSE}"; then - as_fn_error "conditional \"HAVE_GDBM\" was never defined. + as_fn_error $? "conditional \"HAVE_GDBM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_DBM_TRUE}" && test -z "${HAVE_DBM_FALSE}"; then - as_fn_error "conditional \"HAVE_DBM\" was never defined. + as_fn_error $? "conditional \"HAVE_DBM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBDAEMON_TRUE}" && test -z "${HAVE_LIBDAEMON_FALSE}"; then - as_fn_error "conditional \"HAVE_LIBDAEMON\" was never defined. + as_fn_error $? "conditional \"HAVE_LIBDAEMON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then - as_fn_error "conditional \"HAVE_PYTHON\" was never defined. + as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYGTK_TRUE}" && test -z "${HAVE_PYGTK_FALSE}"; then - as_fn_error "conditional \"HAVE_PYGTK\" was never defined. + as_fn_error $? "conditional \"HAVE_PYGTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_PYTHON_DBUS_TRUE}" && test -z "${HAVE_PYTHON_DBUS_FALSE}"; then - as_fn_error "conditional \"HAVE_PYTHON_DBUS\" was never defined. + as_fn_error $? "conditional \"HAVE_PYTHON_DBUS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_MONO_TRUE}" && test -z "${HAVE_MONO_FALSE}"; then - as_fn_error "conditional \"HAVE_MONO\" was never defined. + as_fn_error $? "conditional \"HAVE_MONO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_MONODOC_TRUE}" && test -z "${HAVE_MONODOC_FALSE}"; then - as_fn_error "conditional \"HAVE_MONODOC\" was never defined. + as_fn_error $? "conditional \"HAVE_MONODOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_AUTOIPD_TRUE}" && test -z "${ENABLE_AUTOIPD_FALSE}"; then - as_fn_error "conditional \"ENABLE_AUTOIPD\" was never defined. + as_fn_error $? "conditional \"ENABLE_AUTOIPD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then - as_fn_error "conditional \"DX_COND_doc\" was never defined. + as_fn_error $? "conditional \"DX_COND_doc\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then - as_fn_error "conditional \"DX_COND_doc\" was never defined. + as_fn_error $? "conditional \"DX_COND_doc\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then - as_fn_error "conditional \"DX_COND_dot\" was never defined. + as_fn_error $? "conditional \"DX_COND_dot\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then - as_fn_error "conditional \"DX_COND_dot\" was never defined. + as_fn_error $? "conditional \"DX_COND_dot\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then - as_fn_error "conditional \"DX_COND_man\" was never defined. + as_fn_error $? "conditional \"DX_COND_man\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then - as_fn_error "conditional \"DX_COND_man\" was never defined. + as_fn_error $? "conditional \"DX_COND_man\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then - as_fn_error "conditional \"DX_COND_rtf\" was never defined. + as_fn_error $? "conditional \"DX_COND_rtf\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then - as_fn_error "conditional \"DX_COND_rtf\" was never defined. + as_fn_error $? "conditional \"DX_COND_rtf\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then - as_fn_error "conditional \"DX_COND_xml\" was never defined. + as_fn_error $? "conditional \"DX_COND_xml\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then - as_fn_error "conditional \"DX_COND_xml\" was never defined. + as_fn_error $? "conditional \"DX_COND_xml\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then - as_fn_error "conditional \"DX_COND_chm\" was never defined. + as_fn_error $? "conditional \"DX_COND_chm\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then - as_fn_error "conditional \"DX_COND_chm\" was never defined. + as_fn_error $? "conditional \"DX_COND_chm\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then - as_fn_error "conditional \"DX_COND_chi\" was never defined. + as_fn_error $? "conditional \"DX_COND_chi\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then - as_fn_error "conditional \"DX_COND_chi\" was never defined. + as_fn_error $? "conditional \"DX_COND_chi\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then - as_fn_error "conditional \"DX_COND_html\" was never defined. + as_fn_error $? "conditional \"DX_COND_html\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then - as_fn_error "conditional \"DX_COND_html\" was never defined. + as_fn_error $? "conditional \"DX_COND_html\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then - as_fn_error "conditional \"DX_COND_ps\" was never defined. + as_fn_error $? "conditional \"DX_COND_ps\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then - as_fn_error "conditional \"DX_COND_ps\" was never defined. + as_fn_error $? "conditional \"DX_COND_ps\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then - as_fn_error "conditional \"DX_COND_pdf\" was never defined. + as_fn_error $? "conditional \"DX_COND_pdf\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then - as_fn_error "conditional \"DX_COND_pdf\" was never defined. + as_fn_error $? "conditional \"DX_COND_pdf\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then - as_fn_error "conditional \"DX_COND_latex\" was never defined. + as_fn_error $? "conditional \"DX_COND_latex\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then - as_fn_error "conditional \"DX_COND_latex\" was never defined. + as_fn_error $? "conditional \"DX_COND_latex\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_CORE_DOCS_TRUE}" && test -z "${ENABLE_CORE_DOCS_FALSE}"; then - as_fn_error "conditional \"ENABLE_CORE_DOCS\" was never defined. + as_fn_error $? "conditional \"ENABLE_CORE_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_XMLTOMAN_TRUE}" && test -z "${USE_XMLTOMAN_FALSE}"; then - as_fn_error "conditional \"USE_XMLTOMAN\" was never defined. + as_fn_error $? "conditional \"USE_XMLTOMAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then - as_fn_error "conditional \"BUILD_MANPAGES\" was never defined. + as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then - as_fn_error "conditional \"ENABLE_TESTS\" was never defined. + as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_COMPAT_LIBDNS_SD_TRUE}" && test -z "${ENABLE_COMPAT_LIBDNS_SD_FALSE}"; then - as_fn_error "conditional \"ENABLE_COMPAT_LIBDNS_SD\" was never defined. + as_fn_error $? "conditional \"ENABLE_COMPAT_LIBDNS_SD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_COMPAT_HOWL_TRUE}" && test -z "${ENABLE_COMPAT_HOWL_FALSE}"; then - as_fn_error "conditional \"ENABLE_COMPAT_HOWL\" was never defined. + as_fn_error $? "conditional \"ENABLE_COMPAT_HOWL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then - as_fn_error "conditional \"HAVE_SYSTEMD\" was never defined. + as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -24610,19 +24467,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -24818,7 +24675,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -24871,8 +24728,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by avahi $as_me 0.6.27, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by avahi $as_me 0.6.28, which was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -24937,11 +24794,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -avahi config.status 0.6.27 -configured by $0, generated by GNU Autoconf 2.65, +avahi config.status 0.6.28 +configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -24997,7 +24854,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -25006,7 +24863,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -25060,184 +24917,198 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + # Quote evaled strings. -for var in SED \ +for var in SHELL \ +ECHO \ +SED \ GREP \ EGREP \ FGREP \ @@ -25261,8 +25132,6 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -SHELL \ -ECHO \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_wl \ lt_prog_compiler_pic \ @@ -25292,6 +25161,7 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ +install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -25302,6 +25172,7 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ +reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ lt_prog_compiler_wl_CXX \ @@ -25327,9 +25198,9 @@ postdep_objects_CXX \ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -25356,6 +25227,7 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -25365,9 +25237,9 @@ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ prelink_cmds_CXX; do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -25375,12 +25247,6 @@ prelink_cmds_CXX; do esac done -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` - ;; -esac - ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -25457,7 +25323,7 @@ do "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -25495,7 +25361,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -25512,7 +25378,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -25526,18 +25392,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -25626,20 +25492,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -25667,7 +25541,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -25752,7 +25626,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -25765,7 +25639,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -25793,7 +25667,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -25820,7 +25694,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -25957,22 +25831,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -25983,19 +25857,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -26156,7 +26030,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -26204,6 +26079,12 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + # The host system. host_alias=$host_alias host=$host @@ -26253,10 +26134,6 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -26278,6 +26155,9 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + # A C compiler. LTCC=$lt_CC @@ -26299,12 +26179,6 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name # The name of the directory that contains temporary libtool files. objdir=$objdir -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that does not interpret backslashes. -ECHO=$lt_ECHO - # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD @@ -26367,6 +26241,9 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -26406,6 +26283,10 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -26679,7 +26560,7 @@ _LT_EOF func_dirname () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else @@ -26690,7 +26571,7 @@ func_dirname () # func_basename file func_basename () { - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED "$basename"` } @@ -26703,10 +26584,8 @@ func_basename () func_stripname () { case ${2} in - .*) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "X${3}" \ - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; esac } @@ -26717,20 +26596,20 @@ my_sed_long_arg='1s/^-[^=]*=//' # func_opt_split func_opt_split () { - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` } # func_lo2o object func_lo2o () { - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` } # func_xform libobj-or-source func_xform () { - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` } # func_arith arithmetic-term... @@ -26791,6 +26670,10 @@ _LT_EOF # The linker used to build libraries. LD=$lt_LD_CXX +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -26942,7 +26825,7 @@ _LT_EOF esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -26970,7 +26853,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -26991,7 +26874,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index 411961a..f2377b7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # USA. AC_PREREQ(2.63) -AC_INIT([avahi],[0.6.27],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.6.28],[avahi (at) lists (dot) freedesktop (dot) org]) AC_CONFIG_SRCDIR([avahi-core/server.c]) AC_CONFIG_MACRO_DIR([common]) AC_CONFIG_HEADERS([config.h]) @@ -29,12 +29,12 @@ AC_SUBST(PACKAGE_URL, [http://avahi.org/]) AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:2:5]) AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [7:0:0]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:7:2]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:8:2]) AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:2:0]) -AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:2:0]) +AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:3:0]) AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0]) AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0]) -AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:2:1]) +AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:3:1]) # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0]) @@ -472,7 +472,7 @@ AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes") # # Introspection support. # -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) # # Check for Qt 3 @@ -770,7 +770,7 @@ AC_ARG_ENABLE(libdaemon, [HAVE_LIBDAEMON=yes]) if test "x$HAVE_LIBDAEMON" = "xyes" ; then - PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.11 ]) + PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.14 ]) AC_SUBST(LIBDAEMON_CFLAGS) AC_SUBST(LIBDAEMON_LIBS) fi @@ -1080,8 +1080,10 @@ AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) # ========================================================================== AC_CONFIG_FILES([ @@ -1,3 +1,16 @@ +Avahi 0.6.28 +============ + +This is a bugfix release. + + * Updates regarding systemd integration + * Properly avoid bus activation on non-systemd systems + * Compatibility with newer gtk3 and gobject introspection + * i18n updates + * Minor other updates + +This release is backwards compatible with Avahi 0.6.x with x < 28. + Avahi 0.6.27 ============ diff --git a/examples/Makefile.in b/examples/Makefile.in index 911c664..ead12c5 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -326,6 +326,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -398,7 +400,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/Makefile.in b/initscript/Makefile.in index 851d9b7..c296251 100644 --- a/initscript/Makefile.in +++ b/initscript/Makefile.in @@ -279,6 +279,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -351,7 +353,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/archlinux/Makefile.in b/initscript/archlinux/Makefile.in index da33398..61ee48f 100644 --- a/initscript/archlinux/Makefile.in +++ b/initscript/archlinux/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/darwin/Makefile.in b/initscript/darwin/Makefile.in index 9c5ceff..936ef11 100644 --- a/initscript/darwin/Makefile.in +++ b/initscript/darwin/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/debian/Makefile.in b/initscript/debian/Makefile.in index 5b9f563..22b7281 100644 --- a/initscript/debian/Makefile.in +++ b/initscript/debian/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/fedora/Makefile.in b/initscript/fedora/Makefile.in index 10fa149..9869297 100644 --- a/initscript/fedora/Makefile.in +++ b/initscript/fedora/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/freebsd/Makefile.in b/initscript/freebsd/Makefile.in index c682573..deaf562 100644 --- a/initscript/freebsd/Makefile.in +++ b/initscript/freebsd/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/gentoo/Makefile.in b/initscript/gentoo/Makefile.in index 02dce18..f15e404 100644 --- a/initscript/gentoo/Makefile.in +++ b/initscript/gentoo/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/lfs/Makefile.in b/initscript/lfs/Makefile.in index a4a0fb0..e4d1855 100644 --- a/initscript/lfs/Makefile.in +++ b/initscript/lfs/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/mandriva/Makefile.in b/initscript/mandriva/Makefile.in index 0c56690..c290bca 100644 --- a/initscript/mandriva/Makefile.in +++ b/initscript/mandriva/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/slackware/Makefile.in b/initscript/slackware/Makefile.in index b4c8d12..7a1c6bd 100644 --- a/initscript/slackware/Makefile.in +++ b/initscript/slackware/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/initscript/suse/Makefile.in b/initscript/suse/Makefile.in index 23d4541..a7141ef 100644 --- a/initscript/suse/Makefile.in +++ b/initscript/suse/Makefile.in @@ -252,6 +252,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -324,7 +326,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -1,9 +1,10 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.2.10 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +33,54 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.10 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to <bug-libtool@gnu.org>. -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION=2.2.6b +VERSION=2.2.10 TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3175 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +96,15 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,15 +117,24 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -159,32 +178,168 @@ basename="s,^.*/,," func_dirname_and_basename () { # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else func_dirname_result="$func_dirname_result${2}" fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` } # Generated shell functions inserted here. -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -258,6 +413,13 @@ func_verbose () : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () @@ -326,9 +488,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +540,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +554,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +581,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -489,14 +651,19 @@ func_show_eval_locale () } - - - # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,19 +676,20 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { $SED -n '/^# Usage:/,/# Report bugs to/ { @@ -538,7 +706,10 @@ func_help () s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p }' < "$progpath" - exit $? + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,7 +717,7 @@ func_help () # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + func_error "missing argument for $1." exit_cmd=exit } @@ -556,29 +727,6 @@ exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF -$* -EOF - exit $EXIT_SUCCESS -fi magic="%%%MAGIC variable%%%" magic_exe="%%%MAGIC EXE variable%%%" @@ -636,16 +784,16 @@ func_config () # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -772,10 +920,21 @@ func_enable_tag () --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: + opt_verbose=false + ;; + + --no-quiet|--no-silent) + preserve_args="$preserve_args $opt" + opt_silent=false ;; --verbose| -v) preserve_args="$preserve_args $opt" opt_silent=false + opt_verbose=: + ;; + + --no-verbose) preserve_args="$preserve_args $opt" + opt_verbose=false ;; --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break @@ -793,6 +952,7 @@ func_enable_tag () -\?|-h) func_usage ;; --help) opt_help=: ;; + --help-all) opt_help=': help-all' ;; --version) func_version ;; -*) func_fatal_help "unrecognized option \`$opt'" ;; @@ -1016,10 +1176,13 @@ func_infer_tag () func_quote_for_eval "$arg" CC_quoted="$CC_quoted $func_quote_for_eval_result" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1033,8 +1196,11 @@ func_infer_tag () func_quote_for_eval "$arg" CC_quoted="$CC_quoted $func_quote_for_eval_result" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1213,7 +1379,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +1454,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1445,7 +1611,7 @@ compiler." } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () @@ -1482,10 +1648,11 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +1705,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +1725,8 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +1755,11 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1623,14 +1797,40 @@ Otherwise, only FILE itself is deleted using RM." ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1712,7 +1912,7 @@ func_mode_execute () for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1754,7 +1954,7 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS @@ -1795,23 +1995,23 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" for libdir in $libdirs; do $ECHO " $libdir" done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" fi if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR @@ -1823,21 +2023,21 @@ func_mode_finish () $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi - $ECHO + echo - $ECHO "See any operating system documentation about shared libraries for" + echo "See any operating system documentation about shared libraries for" case $host in solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." ;; *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + echo "more information, such as the ld(1) and ld.so(8) manual pages." ;; esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "----------------------------------------------------------------------" exit $EXIT_SUCCESS } @@ -1852,7 +2052,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1867,6 +2067,11 @@ func_mode_install () # Aesthetically quote it. func_quote_for_eval "$arg" install_prog="$install_prog$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,8 +2081,10 @@ func_mode_install () install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then files="$files $dest" dest=$arg @@ -1887,10 +2094,9 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2110,10 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1915,6 +2125,10 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" install_prog="$install_prog $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + install_shared_prog="$install_shared_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2137,13 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2010,7 +2231,7 @@ func_mode_install () if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2244,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2264,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2183,7 +2404,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +2423,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +2442,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2323,6 +2544,10 @@ func_generate_dlsyms () extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,7 +2557,7 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_verbose "extracting global C symbols from \`$progfile'" $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" @@ -2371,7 +2596,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2415,10 +2640,10 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { @@ -2428,7 +2653,7 @@ typedef struct { " case $host in *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */" @@ -2441,7 +2666,7 @@ typedef struct { lt_dlsym_const=const ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; $lt_dlsym_const lt_dlsymlist @@ -2457,7 +2682,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2515,16 +2740,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +2763,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +2774,7 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,8 +2785,9 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ @@ -2598,7 +2825,18 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +2907,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +2922,30 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () { - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +2961,6 @@ func_emit_wrapper_part1 () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +2991,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +3126,13 @@ else esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +3140,7 @@ func_emit_wrapper_part2 () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2877,7 +3203,7 @@ func_emit_wrapper_part2 () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " @@ -2894,64 +3220,18 @@ func_emit_wrapper_part2 () $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} # func_to_host_path arg @@ -2978,23 +3258,19 @@ func_emit_wrapper () func_to_host_path () { func_to_host_path_result="$1" - if test -n "$1" ; then + if test -n "$1"; then case $host in *mingw* ) lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' case $build in *mingw* ) # actually, msys # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_path_result=`cygpath -w "$1" | + $SED -e "$lt_sed_naive_backslashify"` ;; * ) # Unfortunately, winepath does not exit with a non-zero @@ -3006,17 +3282,17 @@ func_to_host_path () # the odd construction: func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | $SED -e "$lt_sed_naive_backslashify"` else # Allow warning below. - func_to_host_path_result="" + func_to_host_path_result= fi ;; esac if test -z "$func_to_host_path_result" ; then func_error "Could not determine host path corresponding to" - func_error " '$1'" + func_error " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: func_to_host_path_result="$1" @@ -3049,30 +3325,24 @@ func_to_host_path () func_to_host_pathlist () { func_to_host_pathlist_result="$1" - if test -n "$1" ; then + if test -n "$1"; then case $host in *mingw* ) lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` + func_stripname : : "$1" + func_to_host_pathlist_tmp1=$func_stripname_result case $build in *mingw* ) # Actually, msys. # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` + func_to_host_pathlist_result=` + ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` ;; *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | $SED -e "$lt_sed_naive_backslashify"` ;; * ) @@ -3088,18 +3358,17 @@ func_to_host_pathlist () if test -z "$func_to_host_pathlist_result" ; then func_to_host_pathlist_result="$func_to_host_path_result" else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + func_append func_to_host_pathlist_result ";$func_to_host_path_result" fi fi fi - IFS=: done IFS=$func_to_host_pathlist_oldIFS ;; esac - if test -z "$func_to_host_pathlist_result" ; then + if test -z "$func_to_host_pathlist_result"; then func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" + func_error " \`$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This may break if $1 contains DOS-style drive # specifications. The fix is not to complicate the expression @@ -3116,7 +3385,7 @@ func_to_host_pathlist () ;; esac case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + *: ) func_append func_to_host_pathlist_result ";" ;; esac ;; @@ -3141,31 +3410,23 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include <stdio.h> #include <stdlib.h> #ifdef _MSC_VER # include <direct.h> # include <process.h> # include <io.h> -# define setmode _setmode #else # include <unistd.h> # include <stdint.h> # ifdef __CYGWIN__ # include <io.h> -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif # endif #endif #include <malloc.h> @@ -3177,6 +3438,44 @@ int setenv (const char *, const char *, int); #include <fcntl.h> #include <sys/stat.h> +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -3192,14 +3491,7 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +3522,6 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +3534,13 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,31 +3550,17 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <<EOF - -static const char *script_text_part2 = +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); EOF - func_emit_wrapper_part2 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" cat <<EOF const char * MAGIC_EXE = "$magic_exe"; @@ -3340,24 +3605,10 @@ EOF cat <<"EOF" #define LTWRAPPER_OPTION_PREFIX "--lt-" -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; - static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; - -static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; -static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; - /* argument is putenv-style "foo=bar", value of foo is set to bar */ - -static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; -static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; - /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ - -static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; -static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; - /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; int main (int argc, char *argv[]) @@ -3374,10 +3625,13 @@ main (int argc, char *argv[]) int i; program_name = (char *) xstrdup (base_name (argv[0])); - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); + newargz = XMALLOC (char *, argc + 1); - /* very simple arg parsing; don't want to rely on getopt */ + /* very simple arg parsing; don't want to rely on getopt + * also, copy all non cwrapper options to newargz, except + * argz[0], which is handled differently + */ + newargc=0; for (i = 1; i < argc; i++) { if (strcmp (argv[i], dumpscript_opt) == 0) @@ -3391,25 +3645,57 @@ EOF esac cat <<"EOF" - printf ("%s", script_text_part1); - printf ("%s", script_text_part2); + lt_dump_script (stdout); return 0; } + if (strcmp (argv[i], debug_opt) == 0) + { + lt_debug = 1; + continue; + } + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) + { + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX + namespace, but it is not one of the ones we know about and + have already dealt with, above (inluding dump-script), then + report an error. Otherwise, targets might begin to believe + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX + namespace. The first time any user complains about this, we'll + need to make LTWRAPPER_OPTION_PREFIX a configure-time option + or a configure.ac-settable value. + */ + lt_fatal (__FILE__, __LINE__, + "unrecognized %s option: '%s'", + ltwrapper_option_prefix, argv[i]); + } + /* otherwise ... */ + newargz[++newargc] = xstrdup (argv[i]); } + newargz[++newargc] = NULL; + +EOF + cat <<EOF + /* The GNU banner must be the first non-error debug message */ + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); +EOF + cat <<"EOF" + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); - newargz = XMALLOC (char *, argc + 1); tmp_pathspec = find_executable (argv[0]); if (tmp_pathspec == NULL) - lt_fatal ("Couldn't find %s", argv[0]); - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", - tmp_pathspec)); + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); + lt_debugprintf (__FILE__, __LINE__, + "(main) found exe (before symlink chase) at: %s\n", + tmp_pathspec); actual_cwrapper_path = chase_symlinks (tmp_pathspec); - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", - actual_cwrapper_path)); + lt_debugprintf (__FILE__, __LINE__, + "(main) found exe (after symlink chase) at: %s\n", + actual_cwrapper_path); XFREE (tmp_pathspec); - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); strendzap (actual_cwrapper_path, actual_cwrapper_name); /* wrapper name transforms */ @@ -3427,8 +3713,9 @@ EOF target_name = tmp_pathspec; tmp_pathspec = 0; - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", - target_name)); + lt_debugprintf (__FILE__, __LINE__, + "(main) libtool target name: %s\n", + target_name); EOF cat <<EOF @@ -3481,77 +3768,12 @@ EOF lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); - newargc=0; - for (i = 1; i < argc; i++) - { - if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) - { - if (argv[i][env_set_opt_len] == '=') - { - const char *p = argv[i] + env_set_opt_len + 1; - lt_opt_process_env_set (p); - } - else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_set (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_set_opt); - continue; - } - if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) - { - if (argv[i][env_prepend_opt_len] == '=') - { - const char *p = argv[i] + env_prepend_opt_len + 1; - lt_opt_process_env_prepend (p); - } - else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_prepend (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_prepend_opt); - continue; - } - if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) - { - if (argv[i][env_append_opt_len] == '=') - { - const char *p = argv[i] + env_append_opt_len + 1; - lt_opt_process_env_append (p); - } - else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) - { - lt_opt_process_env_append (argv[++i]); /* don't copy */ - } - else - lt_fatal ("%s missing required argument", env_append_opt); - continue; - } - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) - { - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX - namespace, but it is not one of the ones we know about and - have already dealt with, above (inluding dump-script), then - report an error. Otherwise, targets might begin to believe - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX - namespace. The first time any user complains about this, we'll - need to make LTWRAPPER_OPTION_PREFIX a configure-time option - or a configure.ac-settable value. - */ - lt_fatal ("Unrecognized option in %s namespace: '%s'", - ltwrapper_option_prefix, argv[i]); - } - /* otherwise ... */ - newargz[++newargc] = xstrdup (argv[i]); - } - newargz[++newargc] = NULL; - - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +3782,14 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +3811,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +3845,8 @@ check_executable (const char *path) { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +3863,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +3890,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +3944,8 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +3970,8 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +3997,9 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4021,9 @@ chase_symlinks (const char *pathspec) } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4036,8 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4063,25 @@ strendzap (char *str, const char *pat) return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4090,32 @@ lt_error_core (int exit_status, const char *mode, } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4160,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4184,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : "<NULL>"), - (value ? value : "<NULL>"))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4196,152 @@ lt_update_lib_path (const char *name, const char *value) } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +4386,7 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +4479,11 @@ func_mode_link () esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4425,6 +4745,11 @@ func_mode_link () continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4503,7 +4828,7 @@ func_mode_link () esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; @@ -4522,7 +4847,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4708,7 +5033,7 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" + arg="$arg $func_quote_for_eval_result" compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" @@ -4754,18 +5079,19 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" @@ -4925,7 +5251,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -5048,7 +5374,8 @@ func_mode_link () # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; *) deplibs="$deplibs $deplib" ;; @@ -5227,7 +5554,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5237,15 +5564,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5318,7 +5645,7 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; @@ -5326,7 +5653,7 @@ func_mode_link () esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then @@ -5580,7 +5907,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5683,9 +6010,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5825,21 +6152,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5893,6 +6220,7 @@ func_mode_link () if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -5958,7 +6286,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -6126,7 +6454,7 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" libobjs="$libobjs $objs" @@ -6194,7 +6522,7 @@ func_mode_link () age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6428,14 +6756,14 @@ func_mode_link () oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then @@ -6476,7 +6804,7 @@ func_mode_link () if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -6561,13 +6889,13 @@ EOF newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; @@ -6604,22 +6932,22 @@ EOF newdeplibs="$newdeplibs $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) @@ -6665,7 +6993,7 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | @@ -6680,12 +7008,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6723,7 +7051,7 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" @@ -6734,12 +7062,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6757,25 +7085,25 @@ EOF ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6787,23 +7115,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6813,16 +7141,16 @@ EOF build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6839,9 +7167,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6963,7 +7291,7 @@ EOF done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= @@ -7029,7 +7357,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7130,7 +7458,8 @@ EOF save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7143,12 +7472,12 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do $ECHO "$obj" >> $output done - $ECHO ')' >> $output + echo ')' >> $output delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk @@ -7190,17 +7519,19 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7210,7 +7541,8 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi @@ -7269,7 +7601,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7434,7 +7766,7 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -7445,7 +7777,7 @@ EOF fi # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7505,8 +7837,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7523,8 +7855,8 @@ EOF esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7661,8 +7993,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7674,15 +8006,15 @@ EOF wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7691,7 +8023,7 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -7738,7 +8070,7 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit @@ -7757,7 +8089,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7769,7 +8101,7 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname @@ -7793,18 +8125,7 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7925,7 +8246,7 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" generated="$generated $gentop" func_mkdir_p "$gentop" @@ -8036,7 +8357,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8121,9 +8442,27 @@ EOF fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file diff --git a/man/Makefile.in b/man/Makefile.in index e9d13f5..e61222c 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -279,6 +279,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -351,7 +353,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/po/ChangeLog b/po/ChangeLog index 5a3d667..5eb3079 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,139 +1,55 @@ -2010-07-13 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-07-13 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-07-09 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-05 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. + * Makefile.in.in: Upgrade to gettext-0.18.1. -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> +2010-10-04 gettextize <bug-gnu-gettext@gnu.org> - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-27 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: Upgrade to gettext-0.17. - -2010-06-26 gettextize <bug-gnu-gettext@gnu.org> - - * Makefile.in.in: New file, from gettext-0.17. - * boldquot.sed: New file, from gettext-0.17. - * en@boldquot.header: New file, from gettext-0.17. - * en@quot.header: New file, from gettext-0.17. - * insert-header.sin: New file, from gettext-0.17. - * quot.sed: New file, from gettext-0.17. - * remove-potcdate.sin: New file, from gettext-0.17. - * Rules-quot: New file, from gettext-0.17. + * Makefile.in.in: New file, from gettext-0.18.1. + * boldquot.sed: New file, from gettext-0.18.1. + * en@boldquot.header: New file, from gettext-0.18.1. + * en@quot.header: New file, from gettext-0.18.1. + * insert-header.sin: New file, from gettext-0.18.1. + * quot.sed: New file, from gettext-0.18.1. + * remove-potcdate.sin: New file, from gettext-0.18.1. + * Rules-quot: New file, from gettext-0.18.1. @@ -1,6 +1,7 @@ bg ca cs +da de el en_AU @@ -9,9 +10,12 @@ en_GB en_NZ es fi +fo fr gl +he hu +id it ja ms @@ -20,6 +24,7 @@ pl pt_BR ro ru +sl sr sr@latin sv diff --git a/po/da.po b/po/da.po new file mode 100644 index 0000000..ad41854 --- /dev/null +++ b/po/da.po @@ -0,0 +1,876 @@ +# Danish translation for avahi. +# Copyright (C) 2010 avahi & nedenstående oversættere. +# This file is distributed under the same license as the avahi package. +# Joe Hansen <joedalton2@yahoo.dk>, 2010. +# Korrekturlæst Ask, 2010. +# +# konventioner: +# browse -> gennemse +# resolve -> opløs +# resolver -> opløser ? (gnome gvfs) +# +msgid "" +msgstr "" +"Project-Id-Version: avahi\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-08-24 21:06+0100\n" +"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" +"Language-Team: Danish <dansk@dansk-gruppen.dk>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../avahi-common/error.c:30 +msgid "OK" +msgstr "O.k." + +#: ../avahi-common/error.c:31 +msgid "Operation failed" +msgstr "Handling mislykkedes" + +#: ../avahi-common/error.c:32 +msgid "Bad state" +msgstr "Ugyldig tilstand" + +#: ../avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "Ugyldigt værtsnavn" + +#: ../avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "Ugyldigt domænenavn" + +#: ../avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "Ingen egnet netværksprotokol tilgængelig" + +# TTL -> var en forkortelse for Time to live +# måske bedre at sige DNS-tidslængde fremfor DNS-TTL? +#: ../avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "Ugyldig DNS-TTL" + +# hvad er dette? +#: ../avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "Ressourcepostnøgle er mønster" + +#: ../avahi-common/error.c:38 +msgid "Local name collision" +msgstr "Lokal navnekollision" + +#: ../avahi-common/error.c:39 +msgid "Invalid record" +msgstr "Ugyldig post" + +#: ../avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "Ugyldigt tjenestenavn" + +#: ../avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "Ugyldig tjenestetype" + +#: ../avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "Ugyldigt portnummer" + +#: ../avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "Ugyldig postnøgle" + +#: ../avahi-common/error.c:45 +msgid "Invalid address" +msgstr "Ugyldig adresse" + +# Tidsudløb nået +#: ../avahi-common/error.c:46 +msgid "Timeout reached" +msgstr "Tiden løb ud" + +#: ../avahi-common/error.c:47 +msgid "Too many clients" +msgstr "For mange klienter" + +#: ../avahi-common/error.c:48 +msgid "Too many objects" +msgstr "For mange objekter" + +#: ../avahi-common/error.c:49 +msgid "Too many entries" +msgstr "For mange punkter" + +#: ../avahi-common/error.c:50 +msgid "OS Error" +msgstr "OS-fejl" + +#: ../avahi-common/error.c:52 +msgid "Access denied" +msgstr "Adgang nægtet" + +#: ../avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "Ugyldig handling" + +#: ../avahi-common/error.c:54 +msgid "An unexpected D-Bus error occured" +msgstr "Der opstod en uventet D-Bus-fejl" + +#: ../avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "Dæmonforbindelse mislykkedes" + +#: ../avahi-common/error.c:56 +msgid "Memory exhausted" +msgstr "Hukommelse opbrugt" + +#: ../avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "Objektet, der blev sat ind, var ikke gyldigt" + +#: ../avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "Dæmon kører ikke" + +#: ../avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "Ugyldigt grænsefladeindeks" + +#: ../avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "Ugyldig protokolspecifikation" + +#: ../avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "Ugyldige flag" + +#: ../avahi-common/error.c:63 +msgid "Not found" +msgstr "Ikke fundet" + +#: ../avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "Ugyldig konfiguration" + +#: ../avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "Forskellige versioner" + +#: ../avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "Ugyldig tjenesteundertype" + +#: ../avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "Ugyldig pakke" + +#: ../avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "Ugyldig DNS-returkode" + +#: ../avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "DNS-fejl: FORMERR" + +#: ../avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "DNS-fejl: SERVFAIL" + +#: ../avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "DNS-fejl: NXDOMAIN" + +#: ../avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "DNS-fejl: NOTIMP" + +#: ../avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "DNS-fejl: REFUSED" + +#: ../avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "DNS-fejl: YXDOMAIN" + +#: ../avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "DNS-fejl: YXRRSET" + +#: ../avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "DNS-fejl: NXRRSET" + +#: ../avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "DNS-fejl: NOTAUTH" + +#: ../avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "DNS-fejl: NOTZONE" + +#: ../avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "Ugyldige RDATA" + +#: ../avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "Ugyldig DNS-type" + +#: ../avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "Ugyldig DNS-klasse" + +#: ../avahi-common/error.c:83 +msgid "Not supported" +msgstr "Ikke understøttet" + +#: ../avahi-common/error.c:85 +msgid "Not permitted" +msgstr "Ikke tilladt" + +#: ../avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "Ugyldigt argument" + +#: ../avahi-common/error.c:87 +msgid "Is empty" +msgstr "Er tom" + +#: ../avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "Den forespurgte handling er ugyldig på grund af redundans" + +#: ../avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "Ugyldig fejlkode" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: ../avahi-python/avahi-discover/avahi-discover.py:76 +msgid "<i>No service currently selected.</i>" +msgstr "<i>Ingen tjeneste valgt i øjeblikket.</i>" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:2 +msgid "Avahi Discovery" +msgstr "Avahi Discovery" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +msgid "Avahi Zeroconf Browser" +msgstr "Avahi Zeroconf-browser" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +msgid "Browse for Zeroconf services available on your network" +msgstr "Kig efter tilgængelige Zeroconftjenester på dit netværk" + +#: ../avahi-python/avahi-discover/avahi-discover.py:224 +msgid "TXT" +msgstr "TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "TXT Data:" +msgstr "TXT-data:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "empty" +msgstr "tom" + +#: ../avahi-python/avahi-discover/avahi-discover.py:228 +msgid "Service Type:" +msgstr "Tjenestetype:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:229 +msgid "Service Name:" +msgstr "Tjenestenavn:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:230 +msgid "Domain Name:" +msgstr "Domænenavn:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:231 +msgid "Interface:" +msgstr "Grænseflade:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:232 +msgid "Address:" +msgstr "Adresse:" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "Kig efter tjenestetyper" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "En NULL-afgrænset liste af tjenestetyper at kigge efter" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "Domæne" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "Domænet som der skal kigges i, eller NULL for standarddomænet" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "Tjenestetype" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "Tjenestetypen på den valgte tjeneste" + +#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +msgid "Service Name" +msgstr "Tjenestenavn" + +#: ../avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "Tjenestenavnet på den valgte tjeneste" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "Adresse" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "Adressen på den klarlagte tjeneste" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "Port" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "IP-portnummeret på den klarlagte tjeneste" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "Værtsnavn" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "Værtsnavnet på den klarlagte tjeneste" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "TXT-data" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "TXT-dataene på den klarlagte tjeneste" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "Opløs tjeneste" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "Opløs den valgte tjeneste automatisk før returnering" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "Opløs tjenesteværtsnavn" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "" +"Resolve the host name of the selected service automatically before returning" +msgstr "" +"Opløs værtsnavnet på den valgte tjeneste automatisk før returnering" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "Adressefamilie" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "Adressefamilien for værtsnavnsopløsning" + +#: ../avahi-ui/avahi-ui.c:324 +#, c-format +msgid "Avahi client failure: %s" +msgstr "Klientfejl for Avahi: %s" + +# GNOME gvfs: har opløser for resolver. +# måske klarlægger +#: ../avahi-ui/avahi-ui.c:386 +#, c-format +msgid "Avahi resolver failure: %s" +msgstr "Opløserfejl for Avahi: %s" + +# måske omvendt og omarrangér %s'erne: +# Kunne ikke gennemse domæne %$2s for tjenestetype %$1s: %$3s +# (det er muligt at det er $%2s el. tilsv., kan ikke lige huske formatet) +#: ../avahi-ui/avahi-ui.c:516 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "Kunne ikke gennemse domæne $%2s for tjenestetype $%1s: $%3s" + +#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "-" + +#: ../avahi-ui/avahi-ui.c:647 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "Domænebrowserfejl for Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:682 +#, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "Kunne ikke læse Avahidomæne: %s" + +#: ../avahi-ui/avahi-ui.c:704 +msgid "Browse service type list is empty!" +msgstr "Listen over typer af gennemsynstjenester er tom!" + +#: ../avahi-ui/avahi-ui.c:715 +#, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "Kunne ikke forbinde til Avahiserver: %s" + +#: ../avahi-ui/avahi-ui.c:733 +msgid "Browsing for services on <b>local network</b>:" +msgstr "Gennemser for tjenester på <b>lokalnetværk</b>:" + +#: ../avahi-ui/avahi-ui.c:735 +#, c-format +msgid "Browsing for services in domain <b>%s</b>:" +msgstr "Gennemser efter tjenester i domæne <b>%s</b>:" + +#: ../avahi-ui/avahi-ui.c:771 +#, c-format +msgid "Failed to create browser for %s: %s" +msgstr "Kunne ikke oprette browser for %s: %s" + +#: ../avahi-ui/avahi-ui.c:901 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "Kunne ikke oprette opløser for %s af typen %s i domæne %s: %s" + +#: ../avahi-ui/avahi-ui.c:976 +#, c-format +msgid "Failed to create domain browser: %s" +msgstr "Kunne ikke oprette domænebrowser: %s" + +#: ../avahi-ui/avahi-ui.c:987 +msgid "Change domain" +msgstr "Ændr domæne" + +#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +msgid "Browsing..." +msgstr "Gennemser..." + +#: ../avahi-ui/avahi-ui.c:1116 +msgid "Initializing..." +msgstr "Initialiserer..." + +#: ../avahi-ui/avahi-ui.c:1140 +msgid "Location" +msgstr "Sted" + +#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +msgid "Name" +msgstr "Navn" + +#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "Type" + +#: ../avahi-ui/avahi-ui.c:1162 +msgid "_Domain..." +msgstr "_Domæne..." + +#: ../avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" +"%s [tilvalg]\n" +"\n" +" -h --help Vis denne hjælp\n" +" -s --ssh Gennemse SSH-servere\n" +" -v --vnc Gennemse VNC-servere\n" +" -S --shell Gennemse både SSH og VNC\n" +" -d --domain=DOMÆNE Domænet der skal gennemses\n" + +#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "For mange argumenter\n" + +#: ../avahi-ui/bssh.c:149 +msgid "Choose Shell Server" +msgstr "Vælg skalserver" + +#: ../avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "Skrivebord" + +#: ../avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "Terminal" + +#: ../avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "Vælg VNC-server" + +#: ../avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "Vælg SSH-server" + +#: ../avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "Forbinder til '%s' ...\n" + +#: ../avahi-ui/bssh.c:240 +#, c-format +msgid "execlp() failed: %s\n" +msgstr "execlp() mislykkedes: %s\n" + +# engelsk fejl? +#: ../avahi-ui/bssh.c:250 +#, c-format +msgid "Canceled.\n" +msgstr "Afbrudt.\n" + +#: ../avahi-ui/bssh.desktop.in.in.h:1 +msgid "Avahi SSH Server Browser" +msgstr "Avahibrowser for SSH-server" + +#: ../avahi-ui/bssh.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "Gennemse for Zeroconf-aktiverede SSH-servere" + +#: ../avahi-ui/bvnc.desktop.in.in.h:1 +msgid "Avahi VNC Server Browser" +msgstr "Avahibrowser for VNC-server" + +#: ../avahi-ui/bvnc.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "Gennemse for Zeroconf-aktiverede VNC-servere" + +# eller alle? +# (tror den er o.k.) +#: ../avahi-utils/avahi-browse.c:107 +#, c-format +msgid ": All for now\n" +msgstr ": Alt for nu\n" + +#: ../avahi-utils/avahi-browse.c:118 +#, c-format +msgid ": Cache exhausted\n" +msgstr ": Mellemlager opbrugt\n" + +#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "Kunne ikke løse tjeneste '%s' af typen '%s' i domæne '%s': %s\n" + +#: ../avahi-utils/avahi-browse.c:340 +#, c-format +msgid "service_browser failed: %s\n" +msgstr "service_browser mislykkedes: %s\n" + +#: ../avahi-utils/avahi-browse.c:378 +#, c-format +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "avahi_service_browser_new() mislykkedes: %s\n" + +#: ../avahi-utils/avahi-browse.c:414 +#, c-format +msgid "service_type_browser failed: %s\n" +msgstr "service_type_browser mislykkedes: %s\n" + +#: ../avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "avahi_service_type_browser_new() mislykkedes: %s\n" + +#: ../avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "avahi_domain_browser_new() mislykkedes: %s\n" + +#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#, c-format +msgid "Failed to query version string: %s\n" +msgstr "Kunne ikke forespørge versionsstreng: %s\n" + +#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-set-host-name.c:189 +#, c-format +msgid "Failed to query host name: %s\n" +msgstr "Kunne ikke forespørge værtsnavn: %s\n" + +#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "Serverversion: %s; værtsnavn: %s\n" + +# Ifce ~ interface ~ grænseflade ~ GrFl +# dog er det måske en dum idé at skrive dette hvis der ikke er en +# oversat dokumentation for dette også +# E er også event, burde blive til B. Igen, hvis vi ikke kan oversætte +# dokumentationen, bør det nok beholdes... +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:549 +#, c-format +msgid "E Ifce Prot Domain\n" +msgstr "E Ifce Prot-domæne\n" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "E Ifce Prot %-*s %-20s domæne\n" + +#. We have been disconnected, so let reconnect +#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "Afbrudt, forbinder igen ...\n" + +#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#, c-format +msgid "Failed to create client object: %s\n" +msgstr "Kunne ikke oprette klientobjekt: %s\n" + +#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#, c-format +msgid "Client failure, exiting: %s\n" +msgstr "Klientfejl, afslutter: %s\n" + +#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#, c-format +msgid "Waiting for daemon ...\n" +msgstr "Venter på dæmon ...\n" + +#: ../avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete " +"list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" +" -h --help Vis denne hjælp\n" +" -V --version Vis version\n" +" -D --browse-domains Gennemse efter browsingdomæner i steden for tjenester\n" +" -a --all Vis alle tjenester, uanset typen\n" +" -d --domain=DOMÆNE Domænet der skal gennemses i\n" +" -v --verbose Aktiver uddybende tilstand\n" +" -t --terminate Afslut efter dumpning af en mere eller mindre fuldstændig " +"liste\n" +" -c --cache Afslut efter dumpning af alle punkter i mellemlageret\n" +" -l --ignore-local Ignorer lokale tjenester\n" +" -r --resolve Løs fundne tjenester\n" +" -f --no-fail Giv ikke fejl hvis dæmonen ikke er tilgængelig\n" +" -p --parsable Uddata i fortolkeligt format\n" + +# evt. smid -> dump +# (tror det er i betydningen 'gem') +#: ../avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" +" -k --no-db-lookup Slå ikke tjenestetyper op\n" +" -b --dump-db Dump tjenestetypedatabase\n" + +#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#, c-format +msgid "Too few arguments\n" +msgstr "For få argumenter\n" + +#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "Kunne ikke oprette simpelt poll-objekt.\n" + +#: ../avahi-utils/avahi-publish.c:76 +#, c-format +msgid "Established under name '%s'\n" +msgstr "Etableret under navnet '%s'\n" + +#: ../avahi-utils/avahi-publish.c:81 +#, c-format +msgid "Failed to register: %s\n" +msgstr "Kunne ikke registrere: %s\n" + +#: ../avahi-utils/avahi-publish.c:94 +#, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "Navnesammenstød, vælger nyt navn '%s'.\n" + +#: ../avahi-utils/avahi-publish.c:114 +#, c-format +msgid "Failed to create entry group: %s\n" +msgstr "Kunne ikke oprette punktgruppe: %s\n" + +#: ../avahi-utils/avahi-publish.c:124 +#, c-format +msgid "Failed to add address: %s\n" +msgstr "Kunne ikke tilføje adresse: %s\n" + +#: ../avahi-utils/avahi-publish.c:134 +#, c-format +msgid "Failed to add service: %s\n" +msgstr "Kunne ikke tilføje tjeneste: %s\n" + +#: ../avahi-utils/avahi-publish.c:140 +#, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "Kunne ikke tilføje undertype '%s': %s\n" + +#: ../avahi-utils/avahi-publish.c:191 +#, c-format +msgid "Host name conflict\n" +msgstr "Værtsnavnskonflikt\n" + +#: ../avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s <name> <type> <port> [<txt ...>]\n" +"%s [options] %s <host-name> <address>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service " +"with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" +"%s [tilvalg] %s <navn> <type> <port> [<tekst ...>]\n" +"%s [tilvalg] %s <værtsnavn> <adresse>\n" +"\n" +" -h --help Vis denne hjælp\n" +" -V --version Vis version\n" +" -s --service Udgiv tjeneste\n" +" -a --address Udgiv adresse\n" +" -v --verbose Aktiver uddybende tilstand\n" +" -d --domain=DOMÆNE Domæne hvor tjeneste skal udgives i\n" +" -H --host=DOMÆNE Vært hvor tjeneste residerer\n" +" --subtype=UNDERTYPE En ekstra undertype til at registrere denne\n" +" tjeneste med\n" +" -R --no-reverse Udgiv ikke modsat punkt med adresse\n" +" -f --no-fail Fejl ikke hvis dæmonen ikke er tilgængelig\n" + +#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#, c-format +msgid "Bad number of arguments\n" +msgstr "Ugyldigt antal argumenter\n" + +#: ../avahi-utils/avahi-publish.c:329 +#, c-format +msgid "Failed to parse port number: %s\n" +msgstr "Kunne ikke fortolke portnummer: %s\n" + +#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#, c-format +msgid "No command specified.\n" +msgstr "Ingen kommando angivet.\n" + +#: ../avahi-utils/avahi-resolve.c:89 +#, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "Kunne ikke løse værtsnavn '%s': %s\n" + +#: ../avahi-utils/avahi-resolve.c:126 +#, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "Kunne ikke løse adresse '%s': %s\n" + +#: ../avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s <host name ...>\n" +"%s [options] %s <address ... >\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" +"%s [tilvalg] %s <værtsnavn ...>\n" +"%s [tilvalg] %s <adresse ... >\n" +"\n" +" -h --help Vis denne hjælp\n" +" -V --version Vis version\n" +" -n --name Løs værtsnavn\n" +" -a --address Løs adresse\n" +" -v --verbose Vis uddybende tilstand\n" +" -6 Slå IPv6-adresse op\n" +" -4 Slå IPv4-adresse op\n" + +#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "Kunne ikke oprette værtsnavnsopløser: %s\n" + +#: ../avahi-utils/avahi-resolve.c:309 +#, c-format +msgid "Failed to parse address '%s'\n" +msgstr "Kunne ikke fortolke adresse '%s'\n" + +#: ../avahi-utils/avahi-resolve.c:314 +#, c-format +msgid "Failed to create address resolver: %s\n" +msgstr "Kunne ikke oprette adresseopløser: %s\n" + +#: ../avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] <new host name>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" +"%s [tilvalg] <nyt værtsnavn>\n" +"\n" +" -h --help Vis denne hjælp\n" +" -V --version Vis version\n" +" -v --verbose Aktiver uddybende tilstand\n" + +#: ../avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "Ugyldigt antal argumenter, forventede præcist et.\n" + +#: ../avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "Værtsnavn ændret til %s\n" @@ -3,12 +3,12 @@ # This file is distributed under the same license as the avahi package. # Fabian Affolter <fab@fedoraproject.org>, 2008-2009. # Cornelius Neckenig <tbull@fedoraproject.org>, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: audit-viewer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" "PO-Revision-Date: 2009-04-18 22:48+0100\n" "Last-Translator: Cornelius Neckenig <tbull@fedoraproject.org>\n" "Language-Team: German <fedora-trans-de@redhat.com>\n" @@ -260,9 +260,8 @@ msgid "TXT" msgstr "" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" -msgstr "TXT-Daten" +msgstr "TXT-Daten:" #: ../avahi-python/avahi-discover/avahi-discover.py:226 #, fuzzy @@ -270,28 +269,24 @@ msgid "empty" msgstr "ist leer" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Diensttyp" +msgstr "Diensttyp:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Dienstname" +msgstr "Dienstname:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "Domain" +msgstr "Domainname:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Schnittstelle:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -358,23 +353,22 @@ msgid "The TXT data of the resolved service" msgstr "Die TXT-Daten des aufgelösten Dienstes" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" -msgstr "Auslösungsdienst" +msgstr "Auflösungsdienst" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "Vor dem Rücksprung den selektierten Dienst automatisch auflösen" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" msgstr "Dienst-Rechner-Name auflösen" #: ../avahi-ui/avahi-ui.c:236 -msgid "" -"Resolve the host name of the selected service automatically before returning" +msgid "Resolve the host name of the selected service automatically before returning" msgstr "" +"Vor dem Rücksprung den Hostname des selektierten Dienstes\r\n" +"automatisch auflösen" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" @@ -441,8 +435,7 @@ msgstr "Browser-Erzeugung für %s fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:901 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "" -"Erzeugen eines Resolvers für %s vom Typ %s in Domain %s fehlgeschlagen: %s" +msgstr "Erzeugen eines Resolvers für %s vom Typ %s in Domain %s fehlgeschlagen: %s" #: ../avahi-ui/avahi-ui.c:976 #, c-format @@ -565,8 +558,7 @@ msgstr ": Datencache erschöpft\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "" -"Fehler beim Auflösen des Dienstes '%s' des Typ '%s' in Domain '%s': %s\n" +msgstr "Fehler beim Auflösen des Dienstes '%s' des Typ '%s' in Domain '%s': %s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format @@ -658,8 +650,7 @@ msgid "" " -a --all Show all services, regardless of the type\n" " -d --domain=DOMAIN The domain to browse in\n" " -v --verbose Enable verbose mode\n" -" -t --terminate Terminate after dumping a more or less complete " -"list\n" +" -t --terminate Terminate after dumping a more or less complete list\n" " -c --cache Terminate after dumping all entries from the cache\n" " -l --ignore-local Ignore local services\n" " -r --resolve Resolve services found\n" @@ -668,18 +659,15 @@ msgid "" msgstr "" " -h --help Zeigt diese Hilfe an\n" " -V --version Zeigt die Version an\n" -" -D --browse-domains Durchsuche nach suchenden Domain statt nach " -"Diensten\n" +" -D --browse-domains Durchsuche nach suchenden Domain statt nach Diensten\n" " -a --all Zeigt alle Dienste, ohne Rücksicht auf die Typen\n" " -d --domain=DOMAIN Die Domain zum Durchsuchen\n" " -v --verbose Aktiviert detaillierten Modus\n" -" -t --terminate Beenden nach Ausgeben einer mehr oder weniger " -"kompletten Liste\n" +" -t --terminate Beenden nach Ausgeben einer mehr oder weniger kompletten Liste\n" " -c --cache Beenden nach Ausgeben aller Einträge aus dem Cache\n" " -l --ignore-local Ignoriere lokale Dienste\n" " -r --resolve Löse gefundene Dienste auf\n" -" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar " -"ist\n" +" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar ist\n" " -p --parsable Ausgabe in parsbaren Format\n" #: ../avahi-utils/avahi-browse.c:660 @@ -754,8 +742,7 @@ msgid "" " -v --verbose Enable verbose mode\n" " -d --domain=DOMAIN Domain to publish service in\n" " -H --host=DOMAIN Host where service resides\n" -" --subtype=SUBTYPE An additional subtype to register this service " -"with\n" +" --subtype=SUBTYPE An additional subtype to register this service with\n" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" @@ -769,10 +756,8 @@ msgstr "" " -v --verbose Aktiviert detaillierten Modus\n" " -d --domain=DOMAIN Domain zum Veröffentlichen des Dienstes auf\n" " -H --host=DOMAIN Host, wo sich der Service befindet\n" -" --subtype=SUBTYPE Ein zusätzlicher Untertyp zum Registrieren des " -"Dienstes mit\n" -" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar " -"ist\n" +" --subtype=SUBTYPE Ein zusätzlicher Untertyp zum Registrieren des Dienstes mit\n" +" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar ist\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format @@ -978,24 +963,14 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ msgid "Sort by:" #~ msgstr "Sortieren nach:" -#~ msgid "" -#~ "The chart has too many data points. Please restrict your data filter or " -#~ "use coarser data grouping criteria." -#~ msgstr "" -#~ "Das Diagramm hat zu viele Datenpunkte. Bitte beschränken Sie Ihren " -#~ "Datenfilter oder benutzen Sie coarser-Datengruppierungkriterien." +#~ msgid "The chart has too many data points. Please restrict your data filter or use coarser data grouping criteria." +#~ msgstr "Das Diagramm hat zu viele Datenpunkte. Bitte beschränken Sie Ihren Datenfilter oder benutzen Sie coarser-Datengruppierungkriterien." #~ msgid "Time:" #~ msgstr "Zeit:" -#~ msgid "" -#~ "You can add aditional conditions using the <tt>ausearch</tt> expression " -#~ "language. Run <tt>(man ausearch-expression)</tt> to read the " -#~ "documentation of the language." -#~ msgstr "" -#~ "Sie können zusätzliche Bedingungen hinzufügen mit der <tt>ausearch</tt>-" -#~ "Ausdruckssprache. Führen Sie <tt>(man ausearch-expression)</tt> aus, um " -#~ "die Dokumentaion dieser Sprache zu lesen." +#~ msgid "You can add aditional conditions using the <tt>ausearch</tt> expression language. Run <tt>(man ausearch-expression)</tt> to read the documentation of the language." +#~ msgstr "Sie können zusätzliche Bedingungen hinzufügen mit der <tt>ausearch</tt>-Ausdruckssprache. Führen Sie <tt>(man ausearch-expression)</tt> aus, um die Dokumentaion dieser Sprache zu lesen." #~ msgid "_Ascending" #~ msgstr "_Aufsteigend" @@ -1170,12 +1145,8 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ msgid "Start an audit event viewer." #~ msgstr "Starte eine Audit-Ereignis-Betrachter" -#~ msgid "" -#~ "do not attempt to start the privileged backend for reading system audit " -#~ "logs" -#~ msgstr "" -#~ "versuchen Sie nicht das privilegierte Backend zum Lesen der System-Audit-" -#~ "Berichte zu starten" +#~ msgid "do not attempt to start the privileged backend for reading system audit logs" +#~ msgstr "versuchen Sie nicht das privilegierte Backend zum Lesen der System-Audit-Berichte zu starten" #~ msgid "Error running audit-viewer-server: %s" #~ msgstr "Fehler beim Laufenlassen von audit-viewer-server: %s" @@ -1186,12 +1157,8 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ msgid "A file named \"%s\" already exists. Do you want to replace it?" #~ msgstr "Die Datei \"%s\" existiert bereits. Wollen Sie sie ersetzen?" -#~ msgid "" -#~ "The file already exists in \"%s\". Replacing it will overwrite its " -#~ "contents." -#~ msgstr "" -#~ "Die Datei existiert bereits in \"%s\" . Falls Sie sie ersetzen, wird ihre " -#~ "Inhalt überschreiben." +#~ msgid "The file already exists in \"%s\". Replacing it will overwrite its contents." +#~ msgstr "Die Datei existiert bereits in \"%s\" . Falls Sie sie ersetzen, wird ihre Inhalt überschreiben." #~ msgid "_Replace" #~ msgstr "_Ersetzen" @@ -1301,12 +1268,8 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ msgid "Search..." #~ msgstr "Suche..." -#~ msgid "" -#~ "This program is only for use by audit-viewer and it should not be run " -#~ "manually.\n" -#~ msgstr "" -#~ "Dieses Programm ist nur für die Benutzung durch audit-viewer und es " -#~ "sollte nicht manuell gestartet werden.\n" +#~ msgid "This program is only for use by audit-viewer and it should not be run manually.\n" +#~ msgstr "Dieses Programm ist nur für die Benutzung durch audit-viewer und es sollte nicht manuell gestartet werden.\n" #~ msgid "" #~ "\n" @@ -1324,8 +1287,7 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ "Copyright (C) 2008 Red Hat, Inc. Alle Rechte vorbehalten.\n" #~ "Diese Software wird unter der GPL v.2 verteilt.\n" #~ "\n" -#~ "Dieses Programm wird OHNE GEWÄHRLEISTUNG bereitgestellt, im gesetzlich " -#~ "ermöglichten Umfang." +#~ "Dieses Programm wird OHNE GEWÄHRLEISTUNG bereitgestellt, im gesetzlich ermöglichten Umfang." #~ msgid "The control file is not a socket" #~ msgstr "Die Kontrolldatei ist keine Socket" @@ -1421,13 +1383,11 @@ msgstr "Rechnername erfolgreich geändert auf %s\n" #~ msgstr "Bearbeiten von gewissen Filtern ist nicht unterstützt" #~ msgid "" -#~ "If you edit properties of this tab, these filters will be dropped from " -#~ "the tab's configuration:\n" +#~ "If you edit properties of this tab, these filters will be dropped from the tab's configuration:\n" #~ "%s\n" #~ "Do you still want to edit properties of this tab?" #~ msgstr "" -#~ "Wenn Sie die Eigenschaften dieses Registers bearbeiten, diese Filter aus " -#~ "der Register-Konfiguration werden verworfen:\n" +#~ "Wenn Sie die Eigenschaften dieses Registers bearbeiten, diese Filter aus der Register-Konfiguration werden verworfen:\n" #~ "%s\n" #~ "Wollen Sie immer nich die Eigenschaften dieses Registers bearbeiten?" diff --git a/po/fo.po b/po/fo.po new file mode 100644 index 0000000..1dd46c4 --- /dev/null +++ b/po/fo.po @@ -0,0 +1,816 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Gunleif Joensen <gunleif@gmail.com>, 2010. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-09-10 14:36+0200\n" +"Last-Translator: Gunleif Joensen <gunleif@gmail.com>\n" +"Language-Team: Føroyabólkurin\n" +"Language: fo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" + +#: ../avahi-common/error.c:30 +msgid "OK" +msgstr "OK" + +#: ../avahi-common/error.c:31 +msgid "Operation failed" +msgstr "Atgerð miseydaðist" + +#: ../avahi-common/error.c:32 +msgid "Bad state" +msgstr "Ringur standur" + +#: ../avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "Ógildugt vertsnavn" + +#: ../avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "Ógildugt økisnavn" + +#: ../avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "" + +#: ../avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "Ógildugt DNS TTL" + +#: ../avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "" + +#: ../avahi-common/error.c:38 +msgid "Local name collision" +msgstr "" + +#: ../avahi-common/error.c:39 +msgid "Invalid record" +msgstr "" + +#: ../avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "Ógildugt tænastunavn" + +#: ../avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "Ógildug tænastuslag" + +#: ../avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "Ógildugt portursnummar" + +#: ../avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "" + +#: ../avahi-common/error.c:45 +msgid "Invalid address" +msgstr "Ógildugt atsetur" + +#: ../avahi-common/error.c:46 +#, fuzzy +msgid "Timeout reached" +msgstr "Leikbrá rokki" + +#: ../avahi-common/error.c:47 +msgid "Too many clients" +msgstr "Ov nógvir viðskiftarir" + +#: ../avahi-common/error.c:48 +msgid "Too many objects" +msgstr "Ov nógvir lutir" + +#: ../avahi-common/error.c:49 +msgid "Too many entries" +msgstr "" + +#: ../avahi-common/error.c:50 +msgid "OS Error" +msgstr "" + +#: ../avahi-common/error.c:52 +msgid "Access denied" +msgstr "Atgongd noktað" + +#: ../avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "Ógildug atgerð" + +#: ../avahi-common/error.c:54 +msgid "An unexpected D-Bus error occured" +msgstr "Ein óvantað D-BUS villa hendi" + +#: ../avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "Demónsambinding miseydnaðist" + +#: ../avahi-common/error.c:56 +#, fuzzy +msgid "Memory exhausted" +msgstr "Minni uppbrúkt" + +#: ../avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "" + +#: ../avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "Demónin koyrir ikki" + +#: ../avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "Ógildugt markamótsskrá" + +#: ../avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "" + +#: ../avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "Ógildug fløgg" + +#: ../avahi-common/error.c:63 +msgid "Not found" +msgstr "Ikki funnið" + +#: ../avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "Ógildug samanseting" + +#: ../avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "Útgávur samsvara ikki" + +#: ../avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "Ógildugt tænastu undirslag" + +#: ../avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "Ógildugir pakki" + +#: ../avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "" + +#: ../avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "DNS svíkur: FORMERR" + +#: ../avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "DNS svíkur: SERVFAIL" + +#: ../avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "DNS svíkur: NXDOMAIN" + +#: ../avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "DNS svíkur: NOTIMP" + +#: ../avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "DNS svíkur: REFUSED" + +#: ../avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "DNS svíkur: YXDOMAIN" + +#: ../avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "DNS svíkur: YXRRSET" + +#: ../avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "DNS svíkur: NXRRSET" + +#: ../avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "DNS svíkur: NOTAUTH" + +#: ../avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "DNS svíkur: NOTZONE" + +#: ../avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "Ógildugt RDATA" + +#: ../avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "Ógildugt DNS-slag" + +#: ../avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "Ógildigur DNS-flokkur" + +#: ../avahi-common/error.c:83 +msgid "Not supported" +msgstr "Ikki stuðlað" + +#: ../avahi-common/error.c:85 +msgid "Not permitted" +msgstr "Ikki loyvt" + +#: ../avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "Ógildugt ávirki" + +#: ../avahi-common/error.c:87 +msgid "Is empty" +msgstr "Er tómt" + +#: ../avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "Umbidna atgerðin er ógildug, tí hon er óneyðug" + +#: ../avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "Ógildug villukota" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: ../avahi-python/avahi-discover/avahi-discover.py:76 +msgid "<i>No service currently selected.</i>" +msgstr "<i>Eingin tænasta er vald í løtuni.</i>" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:2 +#, fuzzy +msgid "Avahi Discovery" +msgstr "Avahi uppdagan" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +msgid "Avahi Zeroconf Browser" +msgstr "Avahi Zeroconf kagi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +msgid "Browse for Zeroconf services available on your network" +msgstr "Kaga eftir Zeroconf-tænastum, tøkar á tínum neti" + +#: ../avahi-python/avahi-discover/avahi-discover.py:224 +msgid "TXT" +msgstr "TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "TXT Data:" +msgstr "TXT Dáta:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "empty" +msgstr "tómt" + +#: ../avahi-python/avahi-discover/avahi-discover.py:228 +msgid "Service Type:" +msgstr "Tænastuslag:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:229 +msgid "Service Name:" +msgstr "Tænastunavn:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:230 +msgid "Domain Name:" +msgstr "Økisnavn:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:231 +msgid "Interface:" +msgstr "Markamót:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:232 +msgid "Address:" +msgstr "Atsetur:" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "Kaga eftir tænastusløgum" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "Øki:" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "Tænastuslag:" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "Tænastuslagið á valdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +msgid "Service Name" +msgstr "Tænastunavn:" + +#: ../avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "Tænastunavnið á valdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "Atsetur:" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "Atsetur á avgjørdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "Portur:" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "IP-portursnummarið á avgjørdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "Vertsnavn" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "Vertsnavnið á avgjørdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "TXT Dáta" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "TXT-dáta á avgjørdu tænastuni" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "Avgerð tænastu" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "Avgerð vertsnavn á tænastu" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "" +"Resolve the host name of the selected service automatically before returning" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "Atsetursfamilja" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "Atseturfamiljan til at avgera vertsnavn" + +#: ../avahi-ui/avahi-ui.c:324 +#, c-format +msgid "Avahi client failure: %s" +msgstr "Avahi viðskiftara svíkur: %s" + +#: ../avahi-ui/avahi-ui.c:386 +#, c-format +msgid "Avahi resolver failure: %s" +msgstr "Avahi avgerara svíkur: %s" + +#: ../avahi-ui/avahi-ui.c:516 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "Kagan eftir tænastuslagnum %s í økinum %s miseydnaðist: %s" + +#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:647 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "Avahi økiskagari svíkur: %s" + +#: ../avahi-ui/avahi-ui.c:682 +#, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "Miseydnaðist at lesa Avahi-øki: %s" + +#: ../avahi-ui/avahi-ui.c:704 +msgid "Browse service type list is empty!" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:715 +#, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "Miseydnaðist at sambinda við Avahi-ambætaran: %s" + +#: ../avahi-ui/avahi-ui.c:733 +msgid "Browsing for services on <b>local network</b>:" +msgstr "Kagi eftir tænastum á <b>nærnet</b>:" + +#: ../avahi-ui/avahi-ui.c:735 +#, c-format +msgid "Browsing for services in domain <b>%s</b>:" +msgstr "Kagi eftir tænastum í økinum <b>%s</b>:" + +#: ../avahi-ui/avahi-ui.c:771 +#, c-format +msgid "Failed to create browser for %s: %s" +msgstr "Miseydnaðist at stovna kagara fyri %s: %s" + +#: ../avahi-ui/avahi-ui.c:901 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:976 +#, c-format +msgid "Failed to create domain browser: %s" +msgstr "Miseydnaðist at stovna økiskagara: %s" + +#: ../avahi-ui/avahi-ui.c:987 +msgid "Change domain" +msgstr "Skift øki" + +#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +msgid "Browsing..." +msgstr "Kagi..." + +#: ../avahi-ui/avahi-ui.c:1116 +msgid "Initializing..." +msgstr "Innleiði..." + +#: ../avahi-ui/avahi-ui.c:1140 +msgid "Location" +msgstr "Staður" + +#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +msgid "Name" +msgstr "Navn" + +#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "Slag" + +#: ../avahi-ui/avahi-ui.c:1162 +msgid "_Domain..." +msgstr "_Øki..." + +#: ../avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" +"%s [kostir]\n" +"\n" +" -h --help Sýn hesa hjálp\n" +" -s --ssh Kaga eftir SSH ambætarum\n" +" -v --vnc Kaga eftir VNC ambætarum\n" +" -S --shell Kaga bæði eftir SSH og VNC\n" +" -d --domain=DOMAIN Øki at kaga í\n" + +#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "Ov nógv ávirki\n" + +#: ../avahi-ui/bssh.c:149 +msgid "Choose Shell Server" +msgstr "Vel skelambætara" + +#: ../avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "Skriviborð" + +#: ../avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "Útstøð" + +#: ../avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "Vel VNC-ambætara" + +#: ../avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "Vel SSH-ambætara" + +#: ../avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "Sambindi við '%s' ...\n" + +#: ../avahi-ui/bssh.c:240 +#, c-format +msgid "execlp() failed: %s\n" +msgstr "execlp() miseydnaðist: %s\n" + +#: ../avahi-ui/bssh.c:250 +#, c-format +msgid "Canceled.\n" +msgstr "Ógildað.\n" + +#: ../avahi-ui/bssh.desktop.in.in.h:1 +msgid "Avahi SSH Server Browser" +msgstr "Avahi SSH-tænastu kagi" + +#: ../avahi-ui/bssh.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "Kaga eftir Zeroconf-virkjaðum SSH-ambætarum" + +#: ../avahi-ui/bvnc.desktop.in.in.h:1 +msgid "Avahi VNC Server Browser" +msgstr "Avahi VNC-tænastu kagi" + +#: ../avahi-ui/bvnc.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "Kaga eftir Zeroconf-virkjaðum VNC-ambætarum" + +#: ../avahi-utils/avahi-browse.c:107 +#, c-format, +msgid ": All for now\n" +msgstr ": Tað var so tað\n" + +#: ../avahi-utils/avahi-browse.c:118 +#, c-format +msgid ": Cache exhausted\n" +msgstr ": Kovin er tømdur\n" + +#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:340 +#, c-format +msgid "service_browser failed: %s\n" +msgstr "tænastu_kagari miseydnaðist: %s\n" + +#: ../avahi-utils/avahi-browse.c:378 +#, c-format, fuzzy +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "avahi_service_browser_new() miseydnaðist: %s\n" + +#: ../avahi-utils/avahi-browse.c:414 +#, c-format +msgid "service_type_browser failed: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#, c-format +msgid "Failed to query version string: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-set-host-name.c:189 +#, c-format +msgid "Failed to query host name: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:549 +#, c-format +msgid "E Ifce Prot Domain\n" +msgstr "" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "" + +#. We have been disconnected, so let reconnect +#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#, c-format +msgid "Failed to create client object: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#, c-format +msgid "Client failure, exiting: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#, c-format +msgid "Waiting for daemon ...\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete " +"list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#, c-format +msgid "Too few arguments\n" +msgstr "Ov fá ávirki\n" + +#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:76 +#, c-format +msgid "Established under name '%s'\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:81 +#, c-format +msgid "Failed to register: %s\n" +msgstr "Miseydnaðist at skráseta: %s\n" + +#: ../avahi-utils/avahi-publish.c:94 +#, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "Navnasamanstoytur, velji nýtt navn '%s'.\n" + +#: ../avahi-utils/avahi-publish.c:114 +#, c-format +msgid "Failed to create entry group: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:124 +#, c-format +msgid "Failed to add address: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:134 +#, c-format +msgid "Failed to add service: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:140 +#, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:191 +#, c-format +msgid "Host name conflict\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s <name> <type> <port> [<txt ...>]\n" +"%s [options] %s <host-name> <address>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service " +"with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#, c-format +msgid "Bad number of arguments\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:329 +#, c-format +msgid "Failed to parse port number: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#, c-format +msgid "No command specified.\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:89 +#, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:126 +#, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s <host name ...>\n" +"%s [options] %s <address ... >\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:309 +#, c-format +msgid "Failed to parse address '%s'\n" +msgstr "Miseydnaðist at greina atseturin '%s'\n" + +#: ../avahi-utils/avahi-resolve.c:314 +#, c-format, fuzzy +msgid "Failed to create address resolver: %s\n" +msgstr "Miseydnaðist at stovna atseturs-avgerara" + +#: ../avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] <new host name>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" +"%s [kostir] <nýtt vertsnavn>\n" +"\n" +" -h --help Sýn hesa hjálp\n" +" -V --version Sýn útgávunummar\n" +" -v --verbose Sýn orðamiklan stand\n" + +#: ../avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "Ógildugt tal av ávirkjum, vænti akkurát eitt.\n" + +#: ../avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "Vertsnavn broytt til %s\n" @@ -1,22 +1,24 @@ # Copyright (C) 2008 THE avahi-fr'S COPYRIGHT HOLDER # This file is distributed under the same license as the avahi-fr package. -# Matthieu Rondeau <milanito1985@yahoo.fr>, 2008 -# Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>, 2008 -# Martin-Gomez Pablo <pablo.martin-gomez@laposte.net>, 2008. # # +# Matthieu Rondeau <milanito1985@yahoo.fr>, 2008. +# Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>, 2008. +# Martin-Gomez Pablo <pablo.martin-gomez@laposte.net>, 2008. +# Bruno Patri <bruno.patri@gmail.com>, 2010. msgid "" msgstr "" "Project-Id-Version: Avahi 2008\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2008-07-20 15:58+0200\n" -"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-09-05 10:33+0200\n" +"Last-Translator: Bruno Patri <bruno.patri@gmail.com>\n" "Language-Team: French <fedora-trans-fr@redhat.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.1\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -44,9 +46,10 @@ msgstr "Pas de protocole réseau approprié disponible" #: ../avahi-common/error.c:36 msgid "Invalid DNS TTL" -msgstr "DNS TTL invalide" +msgstr "TTL DNS invalide" #: ../avahi-common/error.c:37 +#, fuzzy msgid "Resource record key is pattern" msgstr "La clef de l'enregistrement de la ressource est modélisée" @@ -72,7 +75,7 @@ msgstr "Numéro de port invalide" #: ../avahi-common/error.c:44 msgid "Invalid record key" -msgstr "Enregistrement de clef invalide" +msgstr "Clé d'enregistrement invalide" #: ../avahi-common/error.c:45 msgid "Invalid address" @@ -116,11 +119,11 @@ msgstr "La connexion au démon a échoué " #: ../avahi-common/error.c:56 msgid "Memory exhausted" -msgstr "Épuisement de la mémoire" +msgstr "Mémoire saturée" #: ../avahi-common/error.c:57 msgid "The object passed in was not valid" -msgstr "L'objet passé n'était pas valide " +msgstr "L'objet transmis n'était pas valide " #: ../avahi-common/error.c:58 msgid "Daemon not running" @@ -164,15 +167,15 @@ msgstr "Code de retour DNS invalide" #: ../avahi-common/error.c:69 msgid "DNS failure: FORMERR" -msgstr "Échec DNS : FORMERR" +msgstr "Échec DNS : FORMERR" #: ../avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" -msgstr "Échec DNS : SERVFAIL" +msgstr "Échec DNS : SERVFAIL" #: ../avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" -msgstr "Échec DNS : NXDOMAIN" +msgstr "Échec DNS : NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" @@ -180,11 +183,11 @@ msgstr "Échec DNS : NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" -msgstr "Échec DNS : REFUSED" +msgstr "Échec DNS : REFUSED" #: ../avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" -msgstr "Échec DNS : YXDOMAIN" +msgstr "Échec DNS : YXDOMAIN" #: ../avahi-common/error.c:76 msgid "DNS failure: YXRRSET" @@ -192,15 +195,15 @@ msgstr "Échec DNS : YXRRSET" #: ../avahi-common/error.c:77 msgid "DNS failure: NXRRSET" -msgstr "Échec DNS : NXRRSET" +msgstr "Échec DNS : NXRRSET" #: ../avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" -msgstr "Échec DNS : NOTAUTH" +msgstr "Échec DNS : NOTAUTH" #: ../avahi-common/error.c:79 msgid "DNS failure: NOTZONE" -msgstr "Échec DNS : NOTZONE" +msgstr "Échec DNS : NOTZONE" #: ../avahi-common/error.c:80 msgid "Invalid RDATA" @@ -216,7 +219,7 @@ msgstr "Classe de DNS invalide" #: ../avahi-common/error.c:83 msgid "Not supported" -msgstr "Non supporté" +msgstr "Non pris en charge" #: ../avahi-common/error.c:85 msgid "Not permitted" @@ -236,64 +239,56 @@ msgstr "L'opération demandée est invalide car redondante" #: ../avahi-common/error.c:94 msgid "Invalid Error Code" -msgstr "Invalide, erreur de code" +msgstr "Code d'erreur invalide" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 #: ../avahi-python/avahi-discover/avahi-discover.py:76 msgid "<i>No service currently selected.</i>" -msgstr "<i>Aucun service sélectionné</i>" +msgstr "<i>Aucun service actuellement sélectionné</i>" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 msgid "Avahi Discovery" msgstr "Découverte Avahi" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 -#, fuzzy msgid "Avahi Zeroconf Browser" -msgstr "Navigateur Zeroconf d'Avahi" +msgstr "Explorateur Zeroconf d'Avahi" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 -#, fuzzy msgid "Browse for Zeroconf services available on your network" -msgstr "Parcourir les services Zeroconf disponibles sur votre réseau" +msgstr "Explorer les services Zeroconf disponibles sur votre réseau" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" -msgstr "Données TXT" +msgstr "Données TXT :" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "Est vide" +msgstr "vide" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Type de service" +msgstr "Type de service :" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Nom de service" +msgstr "Nom du service :" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "Domaine" +msgstr "Nom de domaine :" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Interface :" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "Adresse" +msgstr "Adresse :" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -301,19 +296,17 @@ msgstr "Parcourir les types de service" #: ../avahi-ui/avahi-ui.c:185 msgid "A NULL terminated list of service types to browse for" -msgstr "" +msgstr "Une liste, terminée par NULL, de type de services à parcourir" #: ../avahi-ui/avahi-ui.c:190 -#, fuzzy msgid "Domain" msgstr "Domaine" #: ../avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" -msgstr "Le domain à parcourir, ou NULL pour le domaine par défaut" +msgstr "Le domaine à parcourir, ou NULL pour le domaine par défaut" #: ../avahi-ui/avahi-ui.c:196 -#, fuzzy msgid "Service Type" msgstr "Type de service" @@ -346,7 +339,6 @@ msgid "The IP port number of the resolved service" msgstr "Le numéro du port IP du service résolu" #: ../avahi-ui/avahi-ui.c:219 -#, fuzzy msgid "Host Name" msgstr "Nom d'hôte" @@ -363,31 +355,29 @@ msgid "The TXT data of the resolved service" msgstr "Les données TXT du service résolu" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" -msgstr "Recherche du service" +msgstr "Résoudre le service" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "Résolution automatiquement du service sélectionné avant renvoi" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" -msgstr "Résolution du nom de service de l'hôte" +msgstr "Résolution du nom d'hôte du service" #: ../avahi-ui/avahi-ui.c:236 msgid "" "Resolve the host name of the selected service automatically before returning" -msgstr "" +msgstr "Résolution automatique du nom d'hôte du service sélectionné avant renvoi" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" -msgstr "Famille d'adresse" +msgstr "Famille d'adresses" #: ../avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" -msgstr "La famille d'adresse pour la résolution du nom d'hôte" +msgstr "La famille d'adresses pour la résolution du nom d'hôte" #: ../avahi-ui/avahi-ui.c:324 #, c-format @@ -397,12 +387,12 @@ msgstr "Échec du client Avahi : %s" #: ../avahi-ui/avahi-ui.c:386 #, c-format msgid "Avahi resolver failure: %s" -msgstr "Échec du résolveur Avahi : %s" +msgstr "Échec de résolution Avahi : %s" #: ../avahi-ui/avahi-ui.c:516 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" -msgstr "Échec de l'affichage du type de service %s dans le domaine %s : %s" +msgstr "Échec de l'exploration de type de service %s dans le domaine %s : %s" #: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 #: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 @@ -413,59 +403,58 @@ msgstr "n/a" #: ../avahi-ui/avahi-ui.c:647 #, c-format msgid "Avahi domain browser failure: %s" -msgstr "Échec du navigateur de domaine Avahi : %s" +msgstr "Échec de l'explorateur de domaine Avahi : %s" #: ../avahi-ui/avahi-ui.c:682 #, c-format msgid "Failed to read Avahi domain: %s" -msgstr "Échec de la lecture du domaine Avahi : %s" +msgstr "Échec de la lecture du domaine Avahi : %s" #: ../avahi-ui/avahi-ui.c:704 msgid "Browse service type list is empty!" -msgstr "La liste de navigation des types de services est vide!" +msgstr "La liste des types de services à explorer est vide !" #: ../avahi-ui/avahi-ui.c:715 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "Échec de la connexion au serveur Avahi : %s" +msgstr "Échec de la connexion au serveur Avahi : %s" #: ../avahi-ui/avahi-ui.c:733 msgid "Browsing for services on <b>local network</b>:" -msgstr "Affichage des services dans <b>le réseau local</b> :" +msgstr "Explorer les services sur <b>le réseau local</b> :" #: ../avahi-ui/avahi-ui.c:735 #, c-format msgid "Browsing for services in domain <b>%s</b>:" -msgstr "Affichage des services dans le domaine <b>%s</b> :" +msgstr "Explorer les services du domaine <b>%s</b> :" #: ../avahi-ui/avahi-ui.c:771 #, c-format msgid "Failed to create browser for %s: %s" -msgstr "Échec de création du navigateur pour %s : %s" +msgstr "Échec de création de l'explorateur pour %s : %s" #: ../avahi-ui/avahi-ui.c:901 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" msgstr "" -"Échec de création du résolveur pour %s du type %s dans le domaine %s : %s" +"Échec de la création du résolveur pour %s de type %s dans le domaine %s : %s" #: ../avahi-ui/avahi-ui.c:976 #, c-format msgid "Failed to create domain browser: %s" -msgstr "Échec de création du navigateur de domaine : %s" +msgstr "Échec de création de l'explorateur de domaine : %s" #: ../avahi-ui/avahi-ui.c:987 msgid "Change domain" -msgstr "Changement de domaine" +msgstr "Changer de domaine" #: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 -#, fuzzy msgid "Browsing..." -msgstr "Navigation ..." +msgstr "Exploration..." #: ../avahi-ui/avahi-ui.c:1116 msgid "Initializing..." -msgstr "Initialisation ..." +msgstr "Initialisation..." #: ../avahi-ui/avahi-ui.c:1140 msgid "Location" @@ -481,7 +470,7 @@ msgstr "Type" #: ../avahi-ui/avahi-ui.c:1162 msgid "_Domain..." -msgstr "_Domaine ..." +msgstr "_Domaine..." #: ../avahi-ui/bssh.c:55 #, c-format @@ -496,11 +485,11 @@ msgid "" msgstr "" "%s [options]\n" "\n" -" -h --help Montre l'aide\n" -" -s --ssh Affiche les serveur SSH\n" -" -v --vnc Affiche les serveur VNC\n" -" -S --shell Affiche SSH et VNC\n" -" -d --domain=DOMAIN Le domaine dans lequel naviguer\n" +" -h --help Affiche cette aide\n" +" -s --ssh Explore les serveurs SSH\n" +" -v --vnc Explore les serveurs VNC\n" +" -S --shell Explore SSH et VNC\n" +" -d --domain=DOMAIN Le domaine à explorer\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -509,7 +498,7 @@ msgstr "Trop d'arguments\n" #: ../avahi-ui/bssh.c:149 msgid "Choose Shell Server" -msgstr "Choisissez un serveur Shell" +msgstr "Choisir un serveur Shell" #: ../avahi-ui/bssh.c:151 msgid "Desktop" @@ -521,21 +510,21 @@ msgstr "Terminal" #: ../avahi-ui/bssh.c:156 msgid "Choose VNC server" -msgstr "Choisissez un serveur VNC" +msgstr "Choisir un serveur VNC" #: ../avahi-ui/bssh.c:161 msgid "Choose SSH server" -msgstr "Choisissez un serveur SSH" +msgstr "Choisir un serveur SSH" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "Connexion à « %s » ...\n" +msgstr "Connexion à « %s »...\n" #: ../avahi-ui/bssh.c:240 #, c-format msgid "execlp() failed: %s\n" -msgstr "Échec de execlp() : %s\n" +msgstr "Échec de execlp() : %s\n" #: ../avahi-ui/bssh.c:250 #, c-format @@ -544,41 +533,41 @@ msgstr "Annulé.\n" #: ../avahi-ui/bssh.desktop.in.in.h:1 msgid "Avahi SSH Server Browser" -msgstr "Navigateur de serveur SSH Avahi" +msgstr "Explorateur de serveur SSH Avahi" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Affiche les serveurs SSH avec Zeroconf activé" +msgstr "Explorer les serveurs SSH avec Zeroconf activé" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" -msgstr "Navigateur de serveurs VNC Avahi " +msgstr "Explorateur de serveurs VNC Avahi " #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Affiche les serveurs VNC avec Zeroconf activé" +msgstr "Explorer les serveurs VNC avec Zeroconf activé" #: ../avahi-utils/avahi-browse.c:107 #, c-format msgid ": All for now\n" -msgstr ": C'est tout pour le moment\n" +msgstr " : c'est tout pour le moment\n" #: ../avahi-utils/avahi-browse.c:118 #, c-format msgid ": Cache exhausted\n" -msgstr ": Mémoire cache pleine\n" +msgstr " : mémoire cache saturée\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" msgstr "" -"Échec de résolution du service « %s » de type « %s » dans le domaine « %s » : %" -"s\n" +"Échec de résolution du service « %s » de type « %s » dans le domaine « %s » : " +"%s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format msgid "service_browser failed: %s\n" -msgstr "Échec de service_browser : %s\n" +msgstr "Échec de service_browser : %s\n" #: ../avahi-utils/avahi-browse.c:378 #, c-format @@ -588,36 +577,36 @@ msgstr "Échec de avahi_service_browser_new() : %s\n" #: ../avahi-utils/avahi-browse.c:414 #, c-format msgid "service_type_browser failed: %s\n" -msgstr "Échec de service_type_browser : %s\n" +msgstr "Échec de service_type_browser : %s\n" #: ../avahi-utils/avahi-browse.c:444 #, c-format msgid "avahi_service_type_browser_new() failed: %s\n" -msgstr "Échec de avahi_service_type_browser_new() : %s\n" +msgstr "Échec de avahi_service_type_browser_new() : %s\n" #: ../avahi-utils/avahi-browse.c:519 #, c-format msgid "avahi_domain_browser_new() failed: %s\n" -msgstr "Échec de avahi_domain_browser_new() : %s\n" +msgstr "Échec de avahi_domain_browser_new() : %s\n" #: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 #: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" -msgstr "Échec de la demande de la chaine de version : %s\n" +msgstr "Échec de la demande de la chaîne de version : %s\n" #: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 #: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" -msgstr "Échec de la demande de nom d'hôte : %s\n" +msgstr "Échec de la demande de nom d'hôte : %s\n" #: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 #: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" -msgstr "Version du serveur : %s ; Nom d'hôte : %s\n" +msgstr "Version du serveur : %s ; nom d'hôte : %s\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain @@ -637,25 +626,25 @@ msgstr "Domaine E Ifce Prot %-*s %-20s\n" #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "Déconnecté, reconnexion ...\n" +msgstr "Déconnecté, reconnexion...\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 #: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 #, c-format msgid "Failed to create client object: %s\n" -msgstr "Échec lors de la création de l'objet du client : %s\n" +msgstr "Échec de la création de l'objet client : %s\n" #: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 #: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "Échec du client, arrêt : %s\n" +msgstr "Échec du client, arrêt : %s\n" #: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" -msgstr "En attente du démon ...\n" +msgstr "En attente du démon...\n" #: ../avahi-utils/avahi-browse.c:647 msgid "" @@ -673,16 +662,16 @@ msgid "" " -f --no-fail Don't fail if the daemon is not available\n" " -p --parsable Output in parsable format\n" msgstr "" -" -h --help Montre l'aide\n" -" -V --version Montre la version\n" -" -D --browse-domains Affiche les domaines au lieu des services\n" -" -a --all Montre tous les services, sans se soucier du type\n" -" -d --domain=DOMAIN Le domaine dans lequel naviguer\n" +" -h --help Affiche cette aide\n" +" -V --version Affiche la version\n" +" -D --browse-domains Explore les domaines au lieu des services\n" +" -a --all Explore tous les services, sans se soucier du type\n" +" -d --domain=DOMAIN Le domaine à explorer\n" " -v --verbose Active le mode verbeux\n" -" -t --terminate Met fin après avoir déposé une liste plus ou moins " +" -t --terminate Arrêt après avoir récupéré une liste plus ou moins " "complète\n" -" -c --cache Met fin après avoir déposé toutes les entrées dans " -"le cache\n" +" -c --cache Arrêt après avoir récupéré toutes les entrées du " +"cache\n" " -l --ignore-local Ignore les services locaux\n" " -r --resolve Résout les services trouvés\n" " -f --no-fail N'échoue pas si le démon n'est pas disponible\n" @@ -693,8 +682,8 @@ msgid "" " -k --no-db-lookup Don't lookup service types\n" " -b --dump-db Dump service type database\n" msgstr "" -" -k --no-db-lookup Ne cherche pas les type de service\n" -" -b --dump-db Dépose la base de donnée des type de service\n" +" -k --no-db-lookup Ne cherche pas les types de service\n" +" -b --dump-db Récupère la base de données des types de service\n" #: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 #, c-format @@ -705,27 +694,27 @@ msgstr "Trop peu d'arguments\n" #: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" -msgstr "Échec de création d'un objet de simple sondage\n" +msgstr "Échec de création d'un objet d'interrogation simple\n" #: ../avahi-utils/avahi-publish.c:76 #, c-format msgid "Established under name '%s'\n" -msgstr "Établi sous le nom « %s »\n" +msgstr "Établi sous le nom « %s »\n" #: ../avahi-utils/avahi-publish.c:81 #, c-format msgid "Failed to register: %s\n" -msgstr "Échec d'enregistrement : %s\n" +msgstr "Échec d'enregistrement : %s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "Collision de nom, choix d'un nouveau nom « %s ».\n" +msgstr "Conflit de noms, choix d'un nouveau nom « %s ».\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format msgid "Failed to create entry group: %s\n" -msgstr "Échec de création de l'entrée de groupe : %s\n" +msgstr "Échec de création de l'entrée de groupe : %s\n" #: ../avahi-utils/avahi-publish.c:124 #, c-format @@ -735,20 +724,20 @@ msgstr "Échec de l'ajout de l'adresse : %s\n" #: ../avahi-utils/avahi-publish.c:134 #, c-format msgid "Failed to add service: %s\n" -msgstr "Échec de l'ajout de service : %s\n" +msgstr "Échec de l'ajout de service : %s\n" #: ../avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "Échec de l'ajout du sous-type « %s » : %s\n" +msgstr "Échec de l'ajout du sous-type « %s » : %s\n" #: ../avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" -msgstr "Conflit de nom d'hôte\n" +msgstr "Conflit de noms d'hôtes\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -765,11 +754,11 @@ msgid "" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" -"%s [options] %s <nom> <type> <port> [<texte ...>]\n" +"%s [options] %s <nom> <type> <port> [<texte...>]\n" "%s [options] %s <nom d'hôte> <adresse>\n" "\n" -" -h --help Montre l'aide\n" -" -V --version Montre la version\n" +" -h --help Affiche cette aide\n" +" -V --version Affiche la version\n" " -s --service Publie le service\n" " -a --address Publie l'adresse\n" " -v --verbose Active le mode verbeux\n" @@ -782,27 +771,27 @@ msgstr "" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format msgid "Bad number of arguments\n" -msgstr "Mauvais nombre d'arguments\n" +msgstr "Nombre d'arguments erroné\n" #: ../avahi-utils/avahi-publish.c:329 #, c-format msgid "Failed to parse port number: %s\n" -msgstr "Échec de l'analyse du numéro de port : %s\n" +msgstr "Échec de l'analyse du numéro de port : %s\n" #: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" -msgstr "Pas de commande spécifiée.\n" +msgstr "Aucune commande spécifiée.\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "Échec de résolution du nom d'hôte « %s » : %s\n" +msgstr "Échec de la résolution du nom d'hôte « %s » : %s\n" #: ../avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "Échec de résolution de l'adresse « %s » : %s\n" +msgstr "Échec de la résolution de l'adresse « %s » : %s\n" #: ../avahi-utils/avahi-resolve.c:157 #, c-format @@ -821,8 +810,8 @@ msgstr "" "%s [options] %s <nom d'hôte ...>\n" "%s [options] %s <adresse ... >\n" "\n" -" -h --help Montre l'aide\n" -" -V --version Montre la version\n" +" -h --help Affiche cette aide\n" +" -V --version Affiche la version\n" " -n --name Résout le nom d'hôte\n" " -a --address Résout l'adresse\n" " -v --verbose Active le mode verbeux\n" @@ -832,17 +821,17 @@ msgstr "" #: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" -msgstr "Échec de création du résolveur de nom d'hôte : %s\n" +msgstr "Échec de la création du résolveur de nom d'hôte : %s\n" #: ../avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "Échec de l'analyse de l'adresse « %s »\n" +msgstr "Échec de l'analyse de l'adresse « %s »\n" #: ../avahi-utils/avahi-resolve.c:314 #, c-format msgid "Failed to create address resolver: %s\n" -msgstr "Échec de création du résolveur d'adresse : %s\n" +msgstr "Échec de la création du résolveur d'adresse : %s\n" #: ../avahi-utils/avahi-set-host-name.c:73 #, c-format @@ -855,8 +844,8 @@ msgid "" msgstr "" "%s [options] <nouveau nom d'hôte>\n" "\n" -" -h --help Montre l'aide\n" -" -V --version Montre la version\n" +" -h --help Affiche cette aide\n" +" -V --version Affiche la version\n" " -v --verbose Active le mode verbeux\n" #: ../avahi-utils/avahi-set-host-name.c:114 @@ -868,3 +857,4 @@ msgstr "Nombre d'arguments invalide, il en faut exactement un.\n" #, c-format msgid "Host name successfully changed to %s\n" msgstr "Nom d'hôte changé avec succès pour %s\n" + diff --git a/po/he.po b/po/he.po new file mode 100644 index 0000000..72407cb --- /dev/null +++ b/po/he.po @@ -0,0 +1,805 @@ +# Hebrew translation for avahi +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the avahi package. +# Yaron Shahrabani <sh.yaron@gmail.com>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: avahi\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-07-18 13:19+0200\n" +"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" +"Language-Team: Hebrew <he@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-18 10:16+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../avahi-common/error.c:30 +msgid "OK" +msgstr "אישור" + +#: ../avahi-common/error.c:31 +msgid "Operation failed" +msgstr "הפעולה נכשלה" + +#: ../avahi-common/error.c:32 +msgid "Bad state" +msgstr "מצב בעייתי" + +#: ../avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "שם המארח שגוי" + +#: ../avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "שם המתחם שגוי" + +#: ../avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "אין פרוטוקול תואם זמין" + +#: ../avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "זמן תחיית ה-DNS שגוי" + +#: ../avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "מפתח הקלטת המשאב הינו תבנית" + +#: ../avahi-common/error.c:38 +msgid "Local name collision" +msgstr "התנגשות שם מקומית" + +#: ../avahi-common/error.c:39 +msgid "Invalid record" +msgstr "רשומה שגויה" + +#: ../avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "שם השירות שגוי" + +#: ../avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "סוג השירות שגוי" + +#: ../avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "מספר הפתחה שגוי" + +#: ../avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "מפתח הרשומה שגוי" + +#: ../avahi-common/error.c:45 +msgid "Invalid address" +msgstr "הכתובת שגויה" + +#: ../avahi-common/error.c:46 +msgid "Timeout reached" +msgstr "הגיע תום הזמן" + +#: ../avahi-common/error.c:47 +msgid "Too many clients" +msgstr "יותר מדי לקוחות" + +#: ../avahi-common/error.c:48 +msgid "Too many objects" +msgstr "יותר מדי פריטים" + +#: ../avahi-common/error.c:49 +msgid "Too many entries" +msgstr "יותר מדי רשומות" + +#: ../avahi-common/error.c:50 +msgid "OS Error" +msgstr "שגיאת מערכת ההפעלה" + +#: ../avahi-common/error.c:52 +msgid "Access denied" +msgstr "הגישה נדחתה" + +#: ../avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "פעולה שגויה" + +#: ../avahi-common/error.c:54 +msgid "An unexpected D-Bus error occured" +msgstr "ארעה שגיאת D-Bus לא ידועה" + +#: ../avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "החיבור לסוכן נכשל" + +#: ../avahi-common/error.c:56 +msgid "Memory exhausted" +msgstr "הזכרון הותש" + +#: ../avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "הפריט שהועבר פנימה שגוי" + +#: ../avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "הסוכן אינו פעיל" + +#: ../avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "מפתח תוכן המנשק שגוי" + +#: ../avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "אפיון פרוטוקול שגוי" + +#: ../avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "דגלונים שגויים" + +#: ../avahi-common/error.c:63 +msgid "Not found" +msgstr "לא נמצא" + +#: ../avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "הגדרות שגויות" + +#: ../avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "חוסר תיאום גירסאות" + +#: ../avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "תת-סוג השירות שגוי" + +#: ../avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "מנה שגויה" + +#: ../avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "קוד תגובה שגוי מה-DNS" + +#: ../avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "שגיאת DNS: FORMER" + +#: ../avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "שגיאת DNS: SERVFAIL" + +#: ../avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "שגיאת DNS: NXDOMAIN" + +#: ../avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "שגיאת DNS: NOTIMP" + +#: ../avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "שגיאת DNS: REFUSED" + +#: ../avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "DNS שגיאת: YXDOMAIN" + +#: ../avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "שגיאת DNS: YXRRSET" + +#: ../avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "שגיאת DNS: NXRRSET" + +#: ../avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "שגיאת DNS: NOTAUTH" + +#: ../avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "שגיאת DNS: NOTZONE" + +#: ../avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "RDATA שגוי" + +#: ../avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "סוג ה-DNS שגוי" + +#: ../avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "רמת ה-DNS שגויה" + +#: ../avahi-common/error.c:83 +msgid "Not supported" +msgstr "לא נתמך" + +#: ../avahi-common/error.c:85 +msgid "Not permitted" +msgstr "לא מורשה" + +#: ../avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "ארגומנט שגוי" + +#: ../avahi-common/error.c:87 +msgid "Is empty" +msgstr "הינו ריק" + +#: ../avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "הפעולה המבוקשת שגויה כיוון שהיא מיותרת" + +#: ../avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "קוד שגיאה שגוי" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: ../avahi-python/avahi-discover/avahi-discover.py:76 +msgid "<i>No service currently selected.</i>" +msgstr "<i>לבינתיים לא נבחר אף שירות.</i>" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:2 +msgid "Avahi Discovery" +msgstr "גילוי Avahi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +msgid "Avahi Zeroconf Browser" +msgstr "סייר ה־Zeroconf של Avahi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +msgid "Browse for Zeroconf services available on your network" +msgstr "סיור אחר שירותי Zeroconf הזמינים ברשת שלך" + +#: ../avahi-python/avahi-discover/avahi-discover.py:224 +msgid "TXT" +msgstr "TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "TXT Data:" +msgstr "נתוני TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "empty" +msgstr "ריק" + +#: ../avahi-python/avahi-discover/avahi-discover.py:228 +msgid "Service Type:" +msgstr "סוג השירות:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:229 +msgid "Service Name:" +msgstr "שם השירות:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:230 +msgid "Domain Name:" +msgstr "שם המתחם:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:231 +msgid "Interface:" +msgstr "מנשק:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:232 +msgid "Address:" +msgstr "כתובת:" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "סיור בסוגי השירותים" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "מתחם" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "המתחם לסיור, או NULL למתחם ברירת המחדל" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "סוג השירות" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "סוג השירות של השירות הנבחר" + +#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +msgid "Service Name" +msgstr "שם השירות" + +#: ../avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "שם השירות של השירות הנבחר" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "כתובת" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "כתובת השירות שנפתר" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "פתחה" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "מספר פתחת ה־IP של השירות שנפתר" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "שם המארח" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "שם המארח של השירות שנפתר" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "נתוני TXT" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "נתוני ה־TXT של השירות שנפתר" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "שירות הפתירה" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "שם מארח שירות הפתירה" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "" +"Resolve the host name of the selected service automatically before returning" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "משפחת כתובות" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:324 +#, c-format +msgid "Avahi client failure: %s" +msgstr "כשל בלקוח Avahi:%s" + +#: ../avahi-ui/avahi-ui.c:386 +#, fuzzy, c-format +msgid "Avahi resolver failure: %s" +msgstr "Error creating Avahi resolver: %s" + +#: ../avahi-ui/avahi-ui.c:516 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "לא זמין" + +#: ../avahi-ui/avahi-ui.c:647 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "כשל בדפדפן המתחמים Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:682 +#, fuzzy, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "נכשל בפתירת שם מארח avahi: %s\n" + +#: ../avahi-ui/avahi-ui.c:704 +msgid "Browse service type list is empty!" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:715 +#, fuzzy, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "" +"נכשל בהתחברות לשרת Jamendo.\n" +"%s." + +#: ../avahi-ui/avahi-ui.c:733 +msgid "Browsing for services on <b>local network</b>:" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:735 +#, c-format +msgid "Browsing for services in domain <b>%s</b>:" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:771 +#, fuzzy, c-format +msgid "Failed to create browser for %s: %s" +msgstr "ארע כשל ביצירת שרת HTTP עבור %s: %s" + +#: ../avahi-ui/avahi-ui.c:901 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "" + +#: ../avahi-ui/avahi-ui.c:976 +#, fuzzy, c-format +msgid "Failed to create domain browser: %s" +msgstr "ארע כשל בהפעלת סייר ה־mDNS: %s\n" + +#: ../avahi-ui/avahi-ui.c:987 +msgid "Change domain" +msgstr "החלפת מתחם" + +#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +msgid "Browsing..." +msgstr "בעיון..." + +#: ../avahi-ui/avahi-ui.c:1116 +msgid "Initializing..." +msgstr "בהליכי הפעלה..." + +#: ../avahi-ui/avahi-ui.c:1140 +msgid "Location" +msgstr "מיקום" + +#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +#, fuzzy +msgid "Name" +msgstr "שם" + +#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "סוג" + +#: ../avahi-ui/avahi-ui.c:1162 +msgid "_Domain..." +msgstr "_מתחם..." + +#: ../avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" + +#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "יותר מדי ארגומנטים\n" + +#: ../avahi-ui/bssh.c:149 +#, fuzzy +msgid "Choose Shell Server" +msgstr "שרת מעטפת מרוחק" + +#: ../avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "שולחן העבודה" + +#: ../avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "מסוף" + +#: ../avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "בחירת שרת VNC" + +#: ../avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "בחירת שרת SSH" + +#: ../avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "מתבצע חיבור אל '%s'...\n" + +#: ../avahi-ui/bssh.c:240 +#, fuzzy, c-format +msgid "execlp() failed: %s\n" +msgstr "האימות נכשל." + +#: ../avahi-ui/bssh.c:250 +#, c-format +msgid "Canceled.\n" +msgstr "בוטל.\n" + +#: ../avahi-ui/bssh.desktop.in.in.h:1 +msgid "Avahi SSH Server Browser" +msgstr "" + +#: ../avahi-ui/bssh.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "" + +#: ../avahi-ui/bvnc.desktop.in.in.h:1 +msgid "Avahi VNC Server Browser" +msgstr "" + +#: ../avahi-ui/bvnc.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:107 +#, fuzzy, c-format +msgid ": All for now\n" +msgstr "לא, זה הכל לעכשיו" + +#: ../avahi-utils/avahi-browse.c:118 +#, fuzzy, c-format +msgid ": Cache exhausted\n" +msgstr "טוען את המטמון" + +#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:340 +#, fuzzy, c-format +msgid "service_browser failed: %s\n" +msgstr "ארע כשל בעת %s שירות Rygel: %s" + +#: ../avahi-utils/avahi-browse.c:378 +#, fuzzy, c-format +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "ארע כשל בהוספת סייר ה־mDNS לשירות %s." + +#: ../avahi-utils/avahi-browse.c:414 +#, fuzzy, c-format +msgid "service_type_browser failed: %s\n" +msgstr "ארע כשל בעת %s שירות Rygel: %s" + +#: ../avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#, fuzzy, c-format +msgid "Failed to query version string: %s\n" +msgstr "ארע כשל בתשאול סוג התוכן עבור '%s'" + +#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-set-host-name.c:189 +#, fuzzy, c-format +msgid "Failed to query host name: %s\n" +msgstr "אימות עם המארח %s נכשל" + +#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#, fuzzy, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "שם המארח או כתובת השרת." + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:549 +#, fuzzy, c-format +msgid "E Ifce Prot Domain\n" +msgstr "שרת שמות מתחם" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "" + +#. We have been disconnected, so let reconnect +#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#, fuzzy, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "%s התנתק" + +#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#, fuzzy, c-format +msgid "Failed to create client object: %s\n" +msgstr "ארע כשל ביצירת פריט מסוג GdkPixbufLoader." + +#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#, fuzzy, c-format +msgid "Client failure, exiting: %s\n" +msgstr "שגיאה בקריאת GIF: %s" + +#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#, fuzzy, c-format +msgid "Waiting for daemon ...\n" +msgstr "מחכה לתקליטור..." + +#: ../avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete " +"list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#, fuzzy, c-format +msgid "Too few arguments\n" +msgstr "יותר מדי ארגומנטים\n" + +#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:76 +#, fuzzy, c-format +msgid "Established under name '%s'\n" +msgstr "שם התקן ALSA" + +#: ../avahi-utils/avahi-publish.c:81 +#, fuzzy, c-format +msgid "Failed to register: %s\n" +msgstr "שגיאה בטעינת %s: %s\n" + +#: ../avahi-utils/avahi-publish.c:94 +#, fuzzy, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "השם החדש ריק." + +#: ../avahi-utils/avahi-publish.c:114 +#, fuzzy, c-format +msgid "Failed to create entry group: %s\n" +msgstr "ארע כשל בקבלת רשימת הקבוצות" + +#: ../avahi-utils/avahi-publish.c:124 +#, fuzzy, c-format +msgid "Failed to add address: %s\n" +msgstr "ארע כשל ביצירת ספר הכתובות '%s': %s" + +#: ../avahi-utils/avahi-publish.c:134 +#, fuzzy, c-format +msgid "Failed to add service: %s\n" +msgstr "ארע כשל בעת %s שירות Rygel: %s" + +#: ../avahi-utils/avahi-publish.c:140 +#, fuzzy, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "ארע כשל בהוספת התקן וירטואלי" + +#: ../avahi-utils/avahi-publish.c:191 +#, fuzzy, c-format +msgid "Host name conflict\n" +msgstr "שנה שם מ_ארח" + +#: ../avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s <name> <type> <port> [<txt ...>]\n" +"%s [options] %s <host-name> <address>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service " +"with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#, fuzzy, c-format +msgid "Bad number of arguments\n" +msgstr "Los posibles argumentos son:" + +#: ../avahi-utils/avahi-publish.c:329 +#, fuzzy, c-format +msgid "Failed to parse port number: %s\n" +msgstr "Failed to parse saved session file: %s\n" + +#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#, fuzzy, c-format +msgid "No command specified.\n" +msgstr "no command specified to execute" + +#: ../avahi-utils/avahi-resolve.c:89 +#, fuzzy, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "Unable to resolve host address" + +#: ../avahi-utils/avahi-resolve.c:126 +#, fuzzy, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "Unable to resolve host address" + +#: ../avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s <host name ...>\n" +"%s [options] %s <address ... >\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:309 +#, fuzzy, c-format +msgid "Failed to parse address '%s'\n" +msgstr "Failed to parse arguments: %s\n" + +#: ../avahi-utils/avahi-resolve.c:314 +#, fuzzy, c-format +msgid "Failed to create address resolver: %s\n" +msgstr "ארע כשל ביצירת ספר הכתובות '%s': %s" + +#: ../avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] <new host name>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" + +#: ../avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "" + +#: ../avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "שם המארח השתנה בהצלחה ל־%s\n" @@ -1,21 +1,21 @@ # Hungarian translation of avahi # Copyright (C) 2008, 2009, Free Software Foundation, Inc. # This file is distributed under the same license as the avahi package. -# -# Gabor Kelemen <kelemeng@gnome.hu>, 2008, 2009. +# +# Gabor Kelemen <kelemeng@gnome.hu>, 2008, 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: HEAD\n" +"Project-Id-Version: avahi master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" "PO-Revision-Date: 2009-03-22 12:57+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@fsf.hu>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -256,41 +256,35 @@ msgstr "Zeroconf szolgáltatások keresése a hálózaton" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" -msgstr "TXT adat" +msgstr "TXT adat:" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "Üres" +msgstr "üres" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Szolgáltatástípus" +msgstr "Szolgáltatástípus:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Szolgáltatásnév" +msgstr "Szolgáltatásnév:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "Tartomány" +msgstr "Tartománynév:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Csatoló:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "Cím" +msgstr "Cím:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -357,23 +351,20 @@ msgid "The TXT data of the resolved service" msgstr "A feloldott szolgáltatás TXT adatai" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" msgstr "Szolgáltatás feloldása" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "A kiválasztott szolgáltatás automatikus feloldása visszatérés előtt" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" msgstr "Szolgáltatás gépnevének feloldása" #: ../avahi-ui/avahi-ui.c:236 -msgid "" -"Resolve the host name of the selected service automatically before returning" -msgstr "" +msgid "Resolve the host name of the selected service automatically before returning" +msgstr "A kiválasztott szolgáltatás gépnevének automatikus feloldása visszatérés előtt" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" @@ -440,9 +431,7 @@ msgstr "Nem sikerült tallózót létrehozni a következőhöz: %s: %s" #: ../avahi-ui/avahi-ui.c:901 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "" -"Nem sikerült $%2s típusú feloldót létrehozni a következőhöz: $%1s a(z) $%3s " -"tartományban: $%4s" +msgstr "Nem sikerült $%2s típusú feloldót létrehozni a következőhöz: $%1s a(z) $%3s tartományban: $%4s" #: ../avahi-ui/avahi-ui.c:976 #, c-format @@ -566,9 +555,7 @@ msgstr ": a gyorsítótár elfogyott\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "" -"A(z) $%2s típusú $%1s szolgáltatás feloldása meghiúsult a(z) $%3s " -"tartományban: $%4s\n" +msgstr "A(z) $%2s típusú $%1s szolgáltatás feloldása meghiúsult a(z) $%3s tartományban: $%4s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format @@ -660,8 +647,7 @@ msgid "" " -a --all Show all services, regardless of the type\n" " -d --domain=DOMAIN The domain to browse in\n" " -v --verbose Enable verbose mode\n" -" -t --terminate Terminate after dumping a more or less complete " -"list\n" +" -t --terminate Terminate after dumping a more or less complete list\n" " -c --cache Terminate after dumping all entries from the cache\n" " -l --ignore-local Ignore local services\n" " -r --resolve Resolve services found\n" @@ -671,14 +657,11 @@ msgstr "" " -h --help Ezen súgó megjelenítése\n" " -V --version Verziószám megjelenítése\n" " -D --browse-domains Szolgáltatások helyett tartományok tallózása\n" -" -a --all Minden szolgáltatás megjelenítése, " -"típusfüggetlenül\n" +" -a --all Minden szolgáltatás megjelenítése, típusfüggetlenül\n" " -d --domain=TARTOMÁNY A tallózandó tartomány\n" " -v --verbose Részletes mód engedélyezése\n" -" -t --terminate Befejezés a többé-kevésbé teljes lista kiírása " -"után\n" -" -c --cache Befejezés a gyorsítótár bejegyzéseinek kiírása " -"után\n" +" -t --terminate Befejezés a többé-kevésbé teljes lista kiírása után\n" +" -c --cache Befejezés a gyorsítótár bejegyzéseinek kiírása után\n" " -l --ignore-local Helyi szolgáltatások figyelmen kívül hagyása\n" " -r --resolve Talált szolgáltatások feloldása\n" " -f --no-fail Ne hibázzon, ha a démon nem érhető el\n" @@ -744,7 +727,7 @@ msgid "Host name conflict\n" msgstr "Gépnévütközés\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -756,8 +739,7 @@ msgid "" " -v --verbose Enable verbose mode\n" " -d --domain=DOMAIN Domain to publish service in\n" " -H --host=DOMAIN Host where service resides\n" -" --subtype=SUBTYPE An additional subtype to register this service " -"with\n" +" --subtype=SUBTYPE An additional subtype to register this service with\n" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" @@ -771,8 +753,9 @@ msgstr "" " -v --verbose Részletes mód engedélyezése\n" " -d --domain=TARTOMÁNY Szolgáltatás közzététele ebben a tartományban\n" " -H --host=TARTOMÁNY A szolgáltatás ezen a gépen található\n" -" --subtype=ALTÍPUS További altípus, amellyel a szolgáltatás " -"regisztrálandó\n" +" --subtype=ALTÍPUS További altípus, amellyel a szolgáltatás regisztrálandó\n" +" -f --no-fail Ne hibázzon, ha a démon nem érhető el\n" +" -R --no-reverse Ne tegye közzé a fordított bejegyzést címmel\n" " -f --no-fail Ne hibázzon, ha a démon nem érhető el\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 diff --git a/po/id.po b/po/id.po new file mode 100644 index 0000000..d122705 --- /dev/null +++ b/po/id.po @@ -0,0 +1,855 @@ +# Indonesian translation for avahi. +# Copyright (C) 2010 avahi's COPYRIGHT HOLDER +# This file is distributed under the same license as the avahi package. +# Andika Triwidada <andika@gmail.com>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: avahi master\n" +"Report-Msgid-Bugs-To: http://avahi.org/report\n" +"POT-Creation-Date: 2010-08-12 03:24+0000\n" +"PO-Revision-Date: 2010-08-15 12:01+0700\n" +"Last-Translator: Andika Triwidada <andika@gmail.com>\n" +"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Poedit-Language: Indonesian\n" +"X-Poedit-Country: Indonesia\n" + +#: ../avahi-common/error.c:30 +msgid "OK" +msgstr "OK" + +#: ../avahi-common/error.c:31 +msgid "Operation failed" +msgstr "Operasi gagal" + +#: ../avahi-common/error.c:32 +msgid "Bad state" +msgstr "Keadaan buruk" + +#: ../avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "Nama host tak valid" + +#: ../avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "Nama domain tak valid" + +#: ../avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "Tak ada protokol jaringan yang cocok" + +#: ../avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "TTL DNS tak valid" + +#: ../avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "Kunci resource record adalah pola" + +#: ../avahi-common/error.c:38 +msgid "Local name collision" +msgstr "Tabrakan nama lokal" + +#: ../avahi-common/error.c:39 +msgid "Invalid record" +msgstr "Record tak valid" + +#: ../avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "Nama layanan tak valid" + +#: ../avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "Jenis layanan tak valid" + +#: ../avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "Nomor port tak valid" + +#: ../avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "Kunci record tak valid" + +#: ../avahi-common/error.c:45 +msgid "Invalid address" +msgstr "Alamat tidak valid" + +#: ../avahi-common/error.c:46 +msgid "Timeout reached" +msgstr "Waktu tunggu habis" + +#: ../avahi-common/error.c:47 +msgid "Too many clients" +msgstr "Terlalu banyak klien" + +#: ../avahi-common/error.c:48 +msgid "Too many objects" +msgstr "Terlalu banyak objek" + +#: ../avahi-common/error.c:49 +msgid "Too many entries" +msgstr "Terlalu banyak entri" + +#: ../avahi-common/error.c:50 +msgid "OS Error" +msgstr "Galat OS" + +#: ../avahi-common/error.c:52 +msgid "Access denied" +msgstr "Akses ditolak" + +#: ../avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "Operasi tidak valid" + +#: ../avahi-common/error.c:54 +msgid "An unexpected D-Bus error occured" +msgstr "Terjadi galat D-Bus yang tak diharapkan" + +#: ../avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "Koneksi daemon gagal" + +#: ../avahi-common/error.c:56 +msgid "Memory exhausted" +msgstr "Kehabisan memori" + +#: ../avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "Objek yang dilewatkan tak valid" + +#: ../avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "Daemon tak berjalan" + +#: ../avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "Indeks antarmuka tak valid" + +#: ../avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "Spesifikasi protokol tak valid" + +#: ../avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "Flag tak valid" + +#: ../avahi-common/error.c:63 +msgid "Not found" +msgstr "Tidak ditemukan" + +#: ../avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "Konfigurasi tak valid" + +#: ../avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "Versi tak cocok" + +#: ../avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "Sub jenis layanan tak valid" + +#: ../avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "Paket tak valid" + +#: ../avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "Kode balikan DNS tak valid" + +#: ../avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "Kegagalan DNS: FORMERR" + +#: ../avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "Kegagalan DNS: SERVFAIL" + +#: ../avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "Kegagalan DNS: NXDOMAIN" + +#: ../avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "Kegagalan DNS: NOTIMP" + +#: ../avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "Kegagalan DNS: REFUSED" + +#: ../avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "Kegagalan DNS: YXDOMAIN" + +#: ../avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "Kegagalan DNS: YXRRSET" + +#: ../avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "Kegagalan DNS: NXRRSET" + +#: ../avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "Kegagalan DNS: NOTAUTH" + +#: ../avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "Kegagalan DNS: NOTZONE" + +#: ../avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "RDATA tak valid" + +#: ../avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "Jenis DNS tak valid" + +#: ../avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "Kelas DNS tak valid" + +#: ../avahi-common/error.c:83 +msgid "Not supported" +msgstr "Tidak didukung" + +#: ../avahi-common/error.c:85 +msgid "Not permitted" +msgstr "Tidak diijinkan" + +#: ../avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "Argumen tidak valid" + +#: ../avahi-common/error.c:87 +msgid "Is empty" +msgstr "Kosong" + +#: ../avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "Operasi yang diminta tak valid karena redundan" + +#: ../avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "Kode Galat Tak Valid" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: ../avahi-python/avahi-discover/avahi-discover.py:76 +msgid "<i>No service currently selected.</i>" +msgstr "<i>Tak ada layanan yang kini dipilih.</i>" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:2 +msgid "Avahi Discovery" +msgstr "Penemuan Avahi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +msgid "Avahi Zeroconf Browser" +msgstr "Peramban Zeroconf Avahi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +msgid "Browse for Zeroconf services available on your network" +msgstr "Ramban layanan Zeroconf yang tersedia pada jaringan Anda" + +#: ../avahi-python/avahi-discover/avahi-discover.py:224 +msgid "TXT" +msgstr "TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "TXT Data:" +msgstr "Data TXT:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "empty" +msgstr "kosong" + +#: ../avahi-python/avahi-discover/avahi-discover.py:228 +msgid "Service Type:" +msgstr "Jenis Layanan:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:229 +msgid "Service Name:" +msgstr "Nama Layanan:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:230 +msgid "Domain Name:" +msgstr "Nama Domain:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:231 +msgid "Interface:" +msgstr "Antarmuka:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:232 +msgid "Address:" +msgstr "Alamat:" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "Ramban Jenis Layanan" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "Suatu daftar berakhiran NULL dari jenis layanan untuk diramban" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "Domain" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "Domain untuk diramban, atau NULL untuk domain bawaan" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "Jenis Layanan" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "Jenis layanan dari layanan yang dipilih" + +#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +msgid "Service Name" +msgstr "Nama Layanan" + +#: ../avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "Nama layanan dari layanan yang dipilih" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "Alamat" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "Alamat dari layanan yang di-resolve" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "Port" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "Nomor port IP dari layanan yang di-resolve" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "Nama Host" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "Nama host dari layanan yang di-resolve" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "Data TXT" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "Data TXT dari layanan yang di-resolve" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "Resolve Layanan" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "Resolve layanan yang dipilih secara otomatis sebelum kembali" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "Resolve Nama Host Layanan" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "" +"Resolve the host name of the selected service automatically before returning" +msgstr "" +"Resolve nama host dari layanan yang dipilih secara otomatis sebelum kembali" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "Famili alamat" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "Famili alamat bagi resolusi nama host" + +#: ../avahi-ui/avahi-ui.c:324 +#, c-format +msgid "Avahi client failure: %s" +msgstr "Kegagalan klien Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:386 +#, c-format +msgid "Avahi resolver failure: %s" +msgstr "Kegagalan resolver Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:516 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "Meramban jenis layanan %s pada domain %s gagal: %s" + +#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "n/a" + +#: ../avahi-ui/avahi-ui.c:647 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "Kegagalan peramban domain Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:682 +#, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "Gagal membaca domain Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:704 +msgid "Browse service type list is empty!" +msgstr "Daftar jenis layanan ramban kosong!" + +#: ../avahi-ui/avahi-ui.c:715 +#, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "Gagal menyambung ke server Avahi: %s" + +#: ../avahi-ui/avahi-ui.c:733 +msgid "Browsing for services on <b>local network</b>:" +msgstr "Meramban layanan pada <b>jaringan lokal</b>:" + +#: ../avahi-ui/avahi-ui.c:735 +#, c-format +msgid "Browsing for services in domain <b>%s</b>:" +msgstr "Meramban layanan pada domain <b>%s</b>:" + +#: ../avahi-ui/avahi-ui.c:771 +#, c-format +msgid "Failed to create browser for %s: %s" +msgstr "Gagal membuat peramban bagi %s: %s" + +#: ../avahi-ui/avahi-ui.c:901 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "Gagal membuat resolver bagi %s dengan jenis %s pada domain %s: %s" + +#: ../avahi-ui/avahi-ui.c:976 +#, c-format +msgid "Failed to create domain browser: %s" +msgstr "Gagal membuat peramban domain: %s" + +#: ../avahi-ui/avahi-ui.c:987 +msgid "Change domain" +msgstr "Ubah domain" + +#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +msgid "Browsing..." +msgstr "Meramban..." + +#: ../avahi-ui/avahi-ui.c:1116 +msgid "Initializing..." +msgstr "Menginisialisasi..." + +#: ../avahi-ui/avahi-ui.c:1140 +msgid "Location" +msgstr "Lokasi" + +#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +msgid "Name" +msgstr "Nama" + +#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "Jenis" + +#: ../avahi-ui/avahi-ui.c:1162 +msgid "_Domain..." +msgstr "_Domain..." + +#: ../avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" +"%s [opsi]\n" +"\n" +" -h --help Tampilkan bantuan ini\n" +" -s --ssh Ramban server SSH\n" +" -v --vnc Ramban server VNC\n" +" -S --shell Ramban SSH dan VNC\n" +" -d --domain=DOMAIN Domain untuk diramban\n" + +#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "Terlalu banyak argumen\n" + +#: ../avahi-ui/bssh.c:149 +msgid "Choose Shell Server" +msgstr "Pilih Server Shell" + +#: ../avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "Desktop" + +#: ../avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "Terminal" + +#: ../avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "Pilih server VNC" + +#: ../avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "Pilih server SSH" + +#: ../avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "Menyambung ke '%s' ...\n" + +#: ../avahi-ui/bssh.c:240 +#, c-format +msgid "execlp() failed: %s\n" +msgstr "execlp() gagal: %s\n" + +#: ../avahi-ui/bssh.c:250 +#, c-format +msgid "Canceled.\n" +msgstr "Dibatalkan.\n" + +#: ../avahi-ui/bssh.desktop.in.in.h:1 +msgid "Avahi SSH Server Browser" +msgstr "Peramban Server SSH Avahi" + +#: ../avahi-ui/bssh.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "Meramban Server SSH Teraktifkan-Zeroconf" + +#: ../avahi-ui/bvnc.desktop.in.in.h:1 +msgid "Avahi VNC Server Browser" +msgstr "Peramban Server VNC Avahi" + +#: ../avahi-ui/bvnc.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "Meramban Server VNC Teraktifkan-Zeroconf" + +#: ../avahi-utils/avahi-browse.c:107 +#, c-format +msgid ": All for now\n" +msgstr ": Semua untuk saat ini\n" + +#: ../avahi-utils/avahi-browse.c:118 +#, c-format +msgid ": Cache exhausted\n" +msgstr ": Singgahan habis\n" + +#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "Gagal meresolve layanan '%s' dengan jenis '%s' pada domain '%s': %s\n" + +#: ../avahi-utils/avahi-browse.c:340 +#, c-format +msgid "service_browser failed: %s\n" +msgstr "service_browser gagal: %s\n" + +#: ../avahi-utils/avahi-browse.c:378 +#, c-format +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "avahi_service_browser_new() gagal: %s\n" + +#: ../avahi-utils/avahi-browse.c:414 +#, c-format +msgid "service_type_browser failed: %s\n" +msgstr "service_type_browser gagal: %s\n" + +#: ../avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "avahi_service_type_browser_new() gagal: %s\n" + +#: ../avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "avahi_domain_browser_new() gagal: %s\n" + +#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#, c-format +msgid "Failed to query version string: %s\n" +msgstr "Gagal meng-query string versi: %s\n" + +#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-set-host-name.c:189 +#, c-format +msgid "Failed to query host name: %s\n" +msgstr "Gagal meng-query nama host: %s\n" + +#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "Versi server: %s; Nama host: %s\n" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:549 +#, c-format +msgid "E Ifce Prot Domain\n" +msgstr "E Ifce Prot Domain\n" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "E Ifce Prot %-*s %-20s Domain\n" + +#. We have been disconnected, so let reconnect +#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "Diputus, sedang menyambung ...\n" + +#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#, c-format +msgid "Failed to create client object: %s\n" +msgstr "Gagal membuat objek klien: %s\n" + +#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#, c-format +msgid "Client failure, exiting: %s\n" +msgstr "Kegagalan klien, keluar: %s\n" + +#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#, c-format +msgid "Waiting for daemon ...\n" +msgstr "Menunggu daemon ...\n" + +#: ../avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete " +"list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" +" -h --help Tampilkan bantuan ini\n" +" -V --version Tampilkan versi\n" +" -D --browse-domains Meramban domain ramban sebagai ganti layanan\n" +" -a --all Tampilkan semua layanan, tak peduli jenisnya\n" +" -d --domain=DOMAIN Domain yang akan diramban\n" +" -v --verbose Aktifkan mode verbose\n" +" -t --terminate Akhiri setelah membongkar daftar yang kurang lebih " +"lengkap\n" +" -c --cache Akhiri setelah membongkar semua entri dari " +"singgahan\n" +" -l --ignore-local Abaikan layanan lokal\n" +" -r --resolve Layanan resolve ditemukan\n" +" -f --no-fail Jangan gagal bila daemon tak tersedia\n" +" -p --parsable Keluaran dalam bentuk yang dapat diurai\n" + +#: ../avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" +" -k --no-db-lookup Jangan lihat jenis layanan\n" +" -b --dump-db Bongkar basis data jenis layanan\n" + +#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#, c-format +msgid "Too few arguments\n" +msgstr "Argumen terlalu sedikit\n" + +#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "Gagal membuat objek poll sederhana.\n" + +#: ../avahi-utils/avahi-publish.c:76 +#, c-format +msgid "Established under name '%s'\n" +msgstr "Terjalin dengan nama '%s'\n" + +#: ../avahi-utils/avahi-publish.c:81 +#, c-format +msgid "Failed to register: %s\n" +msgstr "Gagal mendaftar: %s\n" + +#: ../avahi-utils/avahi-publish.c:94 +#, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "Tabrakan nama, mengambil nama baru '%s'.\n" + +#: ../avahi-utils/avahi-publish.c:114 +#, c-format +msgid "Failed to create entry group: %s\n" +msgstr "Gagal membuat grup entri: %s\n" + +#: ../avahi-utils/avahi-publish.c:124 +#, c-format +msgid "Failed to add address: %s\n" +msgstr "Gagal menambah alamat: %s\n" + +#: ../avahi-utils/avahi-publish.c:134 +#, c-format +msgid "Failed to add service: %s\n" +msgstr "Gagal menambah layanan: %s\n" + +#: ../avahi-utils/avahi-publish.c:140 +#, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "Gagal menambah sub jenis '%s' %s\n" + +#: ../avahi-utils/avahi-publish.c:191 +#, c-format +msgid "Host name conflict\n" +msgstr "Nama host konflik\n" + +#: ../avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s <name> <type> <port> [<txt ...>]\n" +"%s [options] %s <host-name> <address>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service " +"with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" +"%s [opsi] %s <nama> <jenis> <port> [<txt ...>]\n" +"%s [opsi] %s <nama-host> <alamat>\n" +"\n" +" -h --help Tampilkan bantuan ini\n" +" -V --version Tampilkan versi\n" +" -s --service Publikasikan layanan\n" +" -a --address Publikasikan alamat\n" +" -v --verbose Aktifkan mode verbose\n" +" -d --domain=DOMAIN Domain tempat mempublikasikan layanan\n" +" -H --host=DOMAIN Host tempat layanan berada\n" +" --subtype=SUBTYPE Sub jenis tambahan yang disertakan saat mendaftar " +"layanan ini\n" +" -R --no-reverse Jangan publikasikan entri balikan dengan alamat\n" +" -f --no-fail Jangan gagal bila daemon tak tersedia\n" + +#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#, c-format +msgid "Bad number of arguments\n" +msgstr "Cacah argumen salah\n" + +#: ../avahi-utils/avahi-publish.c:329 +#, c-format +msgid "Failed to parse port number: %s\n" +msgstr "Gagal mengurai nomor port: %s\n" + +#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#, c-format +msgid "No command specified.\n" +msgstr "Tak ada perintah yang dinyatakan.\n" + +#: ../avahi-utils/avahi-resolve.c:89 +#, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "Gagal meresolve nama host '%s': %s\n" + +#: ../avahi-utils/avahi-resolve.c:126 +#, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "Gagal meresolve alamat '%s': %s\n" + +#: ../avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s <host name ...>\n" +"%s [options] %s <address ... >\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" +"%s [opsi] %s <nama host ...>\n" +"%s [opsi] %s <alamat ... >\n" +"\n" +" -h --help Tampilkan bantuan ini\n" +" -V --version Tampilkan versi\n" +" -n --name Resolve nama host\n" +" -a --address Resolve alamat\n" +" -v --verbose Aktifkan mode verbose\n" +" -6 Lihat alamat IPv6\n" +" -4 Lihat alamat IPv4\n" + +#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "Gagal membuat resolver nama host: %s\n" + +#: ../avahi-utils/avahi-resolve.c:309 +#, c-format +msgid "Failed to parse address '%s'\n" +msgstr "Gagal mengurai alamat '%s'\n" + +#: ../avahi-utils/avahi-resolve.c:314 +#, c-format +msgid "Failed to create address resolver: %s\n" +msgstr "Gagal membuat resolver alamat: %s\n" + +#: ../avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] <new host name>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" +"%s [opsi] <nama host baru>\n" +"\n" +" -h --help Tampilkan bantuan ini\n" +" -V --version Tampilkan versi\n" +" -v --verbose Aktifkan mode verbose\n" + +#: ../avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "Cacah argumen tak valid, hanya perlu satu.\n" + +#: ../avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "Nama host sukses diubah menjadi %s\n" @@ -1,5 +1,5 @@ # Italian translation of avahi -# Copyright (C) 2008, 2009 the avahi copyright holder +# Copyright (C) 2008, 2009, 2010 the avahi copyright holder # This file is distributed under the same license as the avahi package. # # Silvio Pierro <perplesso82@gmail.com>, 2008. @@ -7,21 +7,21 @@ # Francesco Tombolini <tombo@adamantio.net>, 2008. # Luca Ferretti <elle.uca@ubuntu-it.org>, 2009. # Luca Ferretti <elle.uca@libero.it>, 2009. -# Milo Casagrande <milo@ubuntu.com>, 2009. +# Milo Casagrande <milo@ubuntu.com>, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: avahi.master-tx.it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2009-12-09 21:32+0100\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-09-05 16:48+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-12-08 18:32+0000\n" -"X-Generator: Launchpad (build Unknown)\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Launchpad (build Unknown)\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -263,41 +263,35 @@ msgstr "Esplora i servizi Zeroconf disponibili sulla propria rete" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" -msgstr "Dati TXT" +msgstr "Dati TXT:" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "È vuoto" +msgstr "vuoto" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Tipo di servizio" +msgstr "Tipo di servizio:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Nome di servizio" +msgstr "Nome del servizio:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "Dominio" +msgstr "Nome del dominio:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Interfaccia:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "Indirizzo" +msgstr "Indirizzo:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -364,16 +358,14 @@ msgid "The TXT data of the resolved service" msgstr "I dati TXT del servizio risolto" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" msgstr "Risoluzione del servizio" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "Risolve automaticamente il servizio selezionato prima di uscire" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" msgstr "Risoluzione del nome host del servizio" @@ -381,6 +373,8 @@ msgstr "Risoluzione del nome host del servizio" msgid "" "Resolve the host name of the selected service automatically before returning" msgstr "" +"Risolve automaticamente il l'hostname del servizio selezionato prima di " +"uscire" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" @@ -748,7 +742,7 @@ msgid "Host name conflict\n" msgstr "Conflitto di nome host\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -777,6 +771,7 @@ msgstr "" " -H --host=DOMAIN L'host dove risiedono i servizi\n" " --subtype=SUBTYPE Un sottotipo addizionale con cui registrare questo\n" " servizio\n" +" -R --no-reverse Non pubblica le voci invertite con l'indirizzo\n" " -f --no-fail Non fallisce se il demone non è disponibile\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 @@ -1,16 +1,17 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>, 2009. +# Japanese translation of avahi messages. +# Copyright (C) 2008-2010 avahi +# This file is distributed under the same license as avahi. +# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009. +# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010. # msgid "" msgstr "" -"Project-Id-Version: avahi\n" +"Project-Id-Version: avahi master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2009-09-06 21:14+0900\n" -"Last-Translator: Hyu_gabaru Ryu_ichi <hyu_gabaru@yahoo.co.jp>\n" -"Language-Team: Japanese <fedora-trans-ja@redhat.com>\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-09-05 17:46+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" +"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,59 +22,59 @@ msgstr "OK" #: ../avahi-common/error.c:31 msgid "Operation failed" -msgstr "操作失敗" +msgstr "操作に失敗しました" #: ../avahi-common/error.c:32 msgid "Bad state" -msgstr "不正な状態" +msgstr "不正な状態です" #: ../avahi-common/error.c:33 msgid "Invalid host name" -msgstr "不当なホスト名" +msgstr "不正なホスト名です" #: ../avahi-common/error.c:34 msgid "Invalid domain name" -msgstr "不当なドメイン名" +msgstr "不正なドメイン名です" #: ../avahi-common/error.c:35 msgid "No suitable network protocol available" -msgstr "適切なネットワークプロトコルがありません" +msgstr "適切なネットワークプロトコルが見つかりません" #: ../avahi-common/error.c:36 msgid "Invalid DNS TTL" -msgstr "不当な DNS TTL" +msgstr "不正な DNS TTL 値です" #: ../avahi-common/error.c:37 msgid "Resource record key is pattern" -msgstr "資源記録キーが見本です" +msgstr "リソースレコードキーが繰り返しになっています" #: ../avahi-common/error.c:38 msgid "Local name collision" -msgstr "ローカル名の衝突" +msgstr "ローカル名の衝突が発生しました" #: ../avahi-common/error.c:39 msgid "Invalid record" -msgstr "不当な記録" +msgstr "不正なレコードです" #: ../avahi-common/error.c:41 msgid "Invalid service name" -msgstr "不当なサービス名" +msgstr "不正なサービス名です" #: ../avahi-common/error.c:42 msgid "Invalid service type" -msgstr "不当なサービスタイプ" +msgstr "不正なサービスタイプです" #: ../avahi-common/error.c:43 msgid "Invalid port number" -msgstr "不当なポート番号" +msgstr "不正なポート番号です" #: ../avahi-common/error.c:44 msgid "Invalid record key" -msgstr "不当な記録キー" +msgstr "不正なレコードキーです" #: ../avahi-common/error.c:45 msgid "Invalid address" -msgstr "不当なアドレス" +msgstr "不正なアドレスです" #: ../avahi-common/error.c:46 msgid "Timeout reached" @@ -89,7 +90,7 @@ msgstr "オブジェクトが多すぎます" #: ../avahi-common/error.c:49 msgid "Too many entries" -msgstr "エントリーが多すぎます" +msgstr "エントリが多すぎます" #: ../avahi-common/error.c:50 msgid "OS Error" @@ -101,39 +102,39 @@ msgstr "アクセスが拒否されました" #: ../avahi-common/error.c:53 msgid "Invalid operation" -msgstr "不当な操作" +msgstr "不正な操作です" #: ../avahi-common/error.c:54 msgid "An unexpected D-Bus error occured" -msgstr "予期しない D-Bus エラーが起きました" +msgstr "予期しない D-Bus のエラーが発生しました" #: ../avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "デーモン接続に失敗しました" +msgstr "デーモンの接続が失敗しました" #: ../avahi-common/error.c:56 msgid "Memory exhausted" -msgstr "メモリーを使い尽くしました" +msgstr "メモリ不足です" #: ../avahi-common/error.c:57 msgid "The object passed in was not valid" -msgstr "渡されたオブジェクトが不当です" +msgstr "不正なオブジェクトが渡されました" #: ../avahi-common/error.c:58 msgid "Daemon not running" -msgstr "デーモンが実行していません" +msgstr "デーモンが動作していません" #: ../avahi-common/error.c:59 msgid "Invalid interface index" -msgstr "不当なインターフェースインデックス" +msgstr "不正なインターフェイス一覧です" #: ../avahi-common/error.c:60 msgid "Invalid protocol specification" -msgstr "不当なプロトコル指定" +msgstr "不正なプロトコル定義です" #: ../avahi-common/error.c:61 msgid "Invalid flags" -msgstr "不当なフラッグ" +msgstr "不正なフラグです" #: ../avahi-common/error.c:63 msgid "Not found" @@ -141,75 +142,77 @@ msgstr "見つかりません" #: ../avahi-common/error.c:64 msgid "Invalid configuration" -msgstr "不当な設定" +msgstr "不正な設定です" #: ../avahi-common/error.c:65 msgid "Version mismatch" -msgstr "バージョン不一致" +msgstr "バージョンが一致しません" #: ../avahi-common/error.c:66 msgid "Invalid service subtype" -msgstr "不当なサービスサブタイプ" +msgstr "サービスのサブタイプが不正です" #: ../avahi-common/error.c:67 msgid "Invalid packet" -msgstr "不当なパケット" +msgstr "不正なパケットです" #: ../avahi-common/error.c:68 msgid "Invalid DNS return code" -msgstr "不当な DNS 復帰コード" +msgstr "DNS のリターンコードが不正です" #: ../avahi-common/error.c:69 msgid "DNS failure: FORMERR" -msgstr "DNS 失敗: FORMERR" +msgstr "DNS が失敗しました: FORMERR" #: ../avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" -msgstr "DNS 失敗: SERVFAIL" +msgstr "DNS が失敗しました: SERVFAIL" #: ../avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" -msgstr "DNS 失敗: NXDOMAIN" +msgstr "DNS が失敗しました: NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" -msgstr "DNS 失敗: NOTIMP" +msgstr "DNS が失敗しました: NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" -msgstr "DNS 失敗: REFUSED" +msgstr "DNS が失敗しました: REFUSED" #: ../avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" -msgstr "DNS 失敗: YXDOMAIN" +msgstr "DNS が失敗しました: YXDOMAIN" #: ../avahi-common/error.c:76 msgid "DNS failure: YXRRSET" -msgstr "DNS 失敗: YXRRSET" +msgstr "DNS が失敗しました: YXRRSET" #: ../avahi-common/error.c:77 msgid "DNS failure: NXRRSET" -msgstr "DNS 失敗: NXRRSET" +msgstr "DNS が失敗しました: NXRRSET" #: ../avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" -msgstr "DNS 失敗: NOTAUTH" +msgstr "DNS が失敗しました: NOAUTH" #: ../avahi-common/error.c:79 msgid "DNS failure: NOTZONE" -msgstr "DNS 失敗: NOTZONE" +msgstr "DNS が失敗しました: NOTZONE" #: ../avahi-common/error.c:80 msgid "Invalid RDATA" -msgstr "不当な RDATA" +msgstr "不正な RDATA です" +# http://jprs.jp/tech/index.html#dns-rfc-info で「タイプ」が使用されている #: ../avahi-common/error.c:81 msgid "Invalid DNS type" -msgstr "不当な DNS タイプ" +msgstr "不正な DNS タイプです" +# http://jprs.jp/tech/index.html#dns-rfc-info で「クラス」が使用されている #: ../avahi-common/error.c:82 msgid "Invalid DNS class" -msgstr "不当な DNS クラス" +msgstr "不正な DNS クラスです" #: ../avahi-common/error.c:83 msgid "Not supported" @@ -221,82 +224,80 @@ msgstr "許可されていません" #: ../avahi-common/error.c:86 msgid "Invalid argument" -msgstr "不当なパラメーター" +msgstr "引数が不正です" +# AVAHI_ERR_IS_EMPTY のエラー +# NEWS より引用: +# * API: Return AVAHI_ERR_IS_EMPTY when the user tries to commit an +# empty entry group. #: ../avahi-common/error.c:87 msgid "Is empty" -msgstr "空です" +msgstr "グループが空です" #: ../avahi-common/error.c:88 msgid "The requested operation is invalid because redundant" -msgstr "要求された操作は冗長なので不当です" +msgstr "要求された操作が過剰であった為、操作が異常を起こしました" #: ../avahi-common/error.c:94 msgid "Invalid Error Code" -msgstr "不当なエラーコード" +msgstr "不正なエラーコード" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 #: ../avahi-python/avahi-discover/avahi-discover.py:76 msgid "<i>No service currently selected.</i>" -msgstr "<i>現在、サービスが選択されていません。</i>" +msgstr "<i>現在はどのサービスも選択されていません。</i>" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 msgid "Avahi Discovery" -msgstr "Avahi 発見" +msgstr "Avahi 検索" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 msgid "Avahi Zeroconf Browser" -msgstr "Avahi Zeroconf ブラウザー" +msgstr "Avahi Zeroconf ブラウザ" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 msgid "Browse for Zeroconf services available on your network" -msgstr "あなたのネットワークで Zeroconf サービスのブラウズが利用できます" +msgstr "ネットワーク上の利用可能な Zeroconf サービスを検索" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" msgstr "TXT データ" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "空です" +msgstr "空" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "サービスタイプ" +msgstr "サービスタイプ:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "サービス名" +msgstr "サービス名:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "ドメイン" +msgstr "ドメイン名:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "インターフェイス:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "アドレス" +msgstr "アドレス:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" -msgstr "ブラウズサービスタイプ" +msgstr "サービスタイプの検索" #: ../avahi-ui/avahi-ui.c:185 msgid "A NULL terminated list of service types to browse for" -msgstr "ブラウズするための NULL で終端するサービスタイプの一覧" +msgstr "NULL で終端された検索対象のサービスタイプのリスト" #: ../avahi-ui/avahi-ui.c:190 msgid "Domain" @@ -304,7 +305,8 @@ msgstr "ドメイン" #: ../avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" -msgstr "ブラウズするドメインか、デフォルトのドメインならば NULL" +msgstr "" +"検索するドメインを入力するか、デフォルトのドメインとして NULL を指定する" #: ../avahi-ui/avahi-ui.c:196 msgid "Service Type" @@ -312,7 +314,7 @@ msgstr "サービスタイプ" #: ../avahi-ui/avahi-ui.c:196 msgid "The service type of the selected service" -msgstr "選択したサービスのサービスタイプ" +msgstr "選択されたサービスのサービスタイプ" #: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 msgid "Service Name" @@ -320,7 +322,7 @@ msgstr "サービス名" #: ../avahi-ui/avahi-ui.c:202 msgid "The service name of the selected service" -msgstr "選択したサービスのサービス名" +msgstr "選択されたサービスのサービス名" #: ../avahi-ui/avahi-ui.c:208 msgid "Address" @@ -328,7 +330,7 @@ msgstr "アドレス" #: ../avahi-ui/avahi-ui.c:208 msgid "The address of the resolved service" -msgstr "解決したサービスのアドレス" +msgstr "解決されたサービスのアドレス" #: ../avahi-ui/avahi-ui.c:213 msgid "Port" @@ -336,7 +338,7 @@ msgstr "ポート" #: ../avahi-ui/avahi-ui.c:213 msgid "The IP port number of the resolved service" -msgstr "解決したサービスの IP ポート番号" +msgstr "解決されたサービスの IP ポート番号" #: ../avahi-ui/avahi-ui.c:219 msgid "Host Name" @@ -344,7 +346,7 @@ msgstr "ホスト名" #: ../avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" -msgstr "解決したサービスのホスト名" +msgstr "解決されたサービスのホスト名" #: ../avahi-ui/avahi-ui.c:225 msgid "TXT Data" @@ -352,49 +354,47 @@ msgstr "TXT データ" #: ../avahi-ui/avahi-ui.c:225 msgid "The TXT data of the resolved service" -msgstr "解決したサービスの TXT データ" +msgstr "解決されたサービスの TXT データ" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" -msgstr "解決サービス" +msgstr "サービスの解決" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "戻る前に選択したサービスを自動的に解決" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" -msgstr "解決サービスホスト名" +msgstr "サービスホスト名の解決" #: ../avahi-ui/avahi-ui.c:236 msgid "" "Resolve the host name of the selected service automatically before returning" -msgstr "" +msgstr "戻る前に選択したサービスのホスト名を自動的に解決" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" -msgstr "アドレスファミリー" +msgstr "アドレスファミリ" #: ../avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" -msgstr "ホスト名解決のためのアドレスファミリー" +msgstr "ホスト名解決に利用するアドレスファミリ" #: ../avahi-ui/avahi-ui.c:324 #, c-format msgid "Avahi client failure: %s" -msgstr "Avahi クライアント失敗: %s" +msgstr "Avahi クライアントが失敗しました: %s" #: ../avahi-ui/avahi-ui.c:386 #, c-format msgid "Avahi resolver failure: %s" -msgstr "Avahi リゾルバー失敗: %s" +msgstr "Avahi リゾルバが失敗しました: %s" #: ../avahi-ui/avahi-ui.c:516 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" -msgstr "ドメイン %2$s 中のサービスタイプ %1$s のブラウズ失敗: %3$s" +msgstr "ドメイン %2$s にてサービスタイプ %1$s の検索に失敗しました: %3$s" #: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 #: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 @@ -405,63 +405,61 @@ msgstr "n/a" #: ../avahi-ui/avahi-ui.c:647 #, c-format msgid "Avahi domain browser failure: %s" -msgstr "Avahi ドメインブラウザー失敗: %s" +msgstr "Avahi ドメインブラウザが失敗しました: %s" #: ../avahi-ui/avahi-ui.c:682 #, c-format msgid "Failed to read Avahi domain: %s" -msgstr "Avahi ドメインの読込みに失敗: %s" +msgstr "Avahi ドメインの読み込みに失敗しました: %s" #: ../avahi-ui/avahi-ui.c:704 msgid "Browse service type list is empty!" -msgstr "ブラウズサービスタイプ一覧が空です!" +msgstr "検索サービスタイプのリストが空です!" #: ../avahi-ui/avahi-ui.c:715 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "Avahi サーバーへの接続に失敗: %s" +msgstr "Avahi サーバへの接続が失敗ました: %s" #: ../avahi-ui/avahi-ui.c:733 msgid "Browsing for services on <b>local network</b>:" -msgstr "<b>ローカルネットワーク</b>上のサービスのブラウズ:" +msgstr "<b>ローカルネットワーク</b>でのサービス検索:" #: ../avahi-ui/avahi-ui.c:735 #, c-format msgid "Browsing for services in domain <b>%s</b>:" -msgstr "<b>%s</b>ドメイン中のサービスのブラウズ" +msgstr "ドメイン <b>%s</b> でのサービス検索:" #: ../avahi-ui/avahi-ui.c:771 #, c-format msgid "Failed to create browser for %s: %s" -msgstr "%s のブラウザーの生成に失敗: %s" +msgstr "%1$s のブラウザ作成に失敗しました: %2$s" #: ../avahi-ui/avahi-ui.c:901 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "" -"ドメイン %3$s のタイプ %2$s 用の %1$sのためのリゾルバーの生成に失敗しました: " -"%4$s" +msgstr "ドメイン %3$s のタイプ %2$s の %1$s のリゾルバ作成に失敗しました: %4$s" #: ../avahi-ui/avahi-ui.c:976 #, c-format msgid "Failed to create domain browser: %s" -msgstr "ドメインブラウザーの生成に失敗: %s" +msgstr "ドメインブラウザの作成に失敗しました: %s" #: ../avahi-ui/avahi-ui.c:987 msgid "Change domain" -msgstr "ドメイン変更" +msgstr "ドメインの変更" #: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 msgid "Browsing..." -msgstr "ブラウズ中..." +msgstr "検索中…" #: ../avahi-ui/avahi-ui.c:1116 msgid "Initializing..." -msgstr "初期化中..." +msgstr "初期化中…" #: ../avahi-ui/avahi-ui.c:1140 msgid "Location" -msgstr "位置" +msgstr "場所" #: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 msgid "Name" @@ -473,7 +471,7 @@ msgstr "タイプ" #: ../avahi-ui/avahi-ui.c:1162 msgid "_Domain..." -msgstr "ドメイン..." +msgstr "ドメイン(_D)…" #: ../avahi-ui/bssh.c:55 #, c-format @@ -488,20 +486,20 @@ msgid "" msgstr "" "%s [オプション]\n" "\n" -" -h --help このヘルプを表示\n" -" -s --ssh SSH サーバーをブラウズ\n" -" -v --vnc VNC サーバーをブラウズ\n" -" -S --shell SSH と VNC の両方をブラウズ\n" -" -d --domain=DOMAIN ブラウズするドメイン\n" +" -h --help このヘルプを表示する\n" +" -s --ssh SSH サーバの検索\n" +" -v --vnc VNC サーバの検索\n" +" -S --shell SSH と VNC を検索する\n" +" -d --domain=DOMAIN 検索するドメインを指定\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format msgid "Too many arguments\n" -msgstr "パラメーターが多すぎます\n" +msgstr "引数が多すぎます\n" #: ../avahi-ui/bssh.c:149 msgid "Choose Shell Server" -msgstr "シェルサーバーを選択してください" +msgstr "シェルサーバを選択" #: ../avahi-ui/bssh.c:151 msgid "Desktop" @@ -509,144 +507,145 @@ msgstr "デスクトップ" #: ../avahi-ui/bssh.c:152 msgid "Terminal" -msgstr "端末" +msgstr "ターミナル" #: ../avahi-ui/bssh.c:156 msgid "Choose VNC server" -msgstr "VNC サーバーを選択してください" +msgstr "VNC サーバを選択" #: ../avahi-ui/bssh.c:161 msgid "Choose SSH server" -msgstr "SSH サーバーを選択してください" +msgstr "SSH サーバを選択" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "'%s' へ接続中 ...\n" +msgstr "'%s' へ接続中…\n" #: ../avahi-ui/bssh.c:240 #, c-format msgid "execlp() failed: %s\n" -msgstr "execlp() 失敗: %s\n" +msgstr "execlp() が失敗しました: %s\n" #: ../avahi-ui/bssh.c:250 #, c-format msgid "Canceled.\n" -msgstr "取り消されました。\n" +msgstr "キャンセルされました。\n" #: ../avahi-ui/bssh.desktop.in.in.h:1 msgid "Avahi SSH Server Browser" -msgstr "Avahi SSh サーバーブラウザー" +msgstr "Avahi SSH サーバの検索" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Zeroconf が有効な SSH サーバーのブラウズ" +msgstr "Zeroconf を有効にした SSH サーバを検索" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" -msgstr "Avahi VNC サーバーブラウザー" +msgstr "Avahi VNC サーバの検索" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Zeroconf が有効な VNC サーバーのブラウズ" +msgstr "Zeroconf を有効にした VNC サーバを検索" #: ../avahi-utils/avahi-browse.c:107 #, c-format msgid ": All for now\n" -msgstr ": 今のところの全て\n" +msgstr ": とりあえず全て\n" #: ../avahi-utils/avahi-browse.c:118 #, c-format msgid ": Cache exhausted\n" -msgstr "キャッシュを使い尽くしました\n" +msgstr ": キャッシュが不足しています\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" msgstr "" -"ドメイン '%3$s' 内のタイプ '%2$s'のサービス '%1$s' の解決に失敗: %4$s\n" +"ドメイン '%3$s' のタイプ '%2$s' のサービス '%1$s' の解決に失敗しました: %4" +"$s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format msgid "service_browser failed: %s\n" -msgstr "service_browser 失敗: %s\n" +msgstr "service_browser が失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:378 #, c-format msgid "avahi_service_browser_new() failed: %s\n" -msgstr "avahi_service_browser_new() 失敗: %s\n" +msgstr "avahi_service_browser_new() が失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:414 #, c-format msgid "service_type_browser failed: %s\n" -msgstr "srvice_type_browser 失敗: %s\n" +msgstr "service_type_browser が失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:444 #, c-format msgid "avahi_service_type_browser_new() failed: %s\n" -msgstr "avahi_service_type_browser_new() 失敗: %s\n" +msgstr "avahi_service_type_browser_new() が失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:519 #, c-format msgid "avahi_domain_browser_new() failed: %s\n" -msgstr "avahi_domain_browser_new() 失敗: %s\n" +msgstr "avahi_domain_browser_new() が失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 #: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" -msgstr "バージョン文字列の検索に失敗: %s\n" +msgstr "バージョン文字列のクエリに失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 #: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" -msgstr "ホスト名の検索に失敗: %s\n" +msgstr "ホスト名のクエリに失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 #: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" -msgstr "サーバーバージョン: %s; ホスト名: %s\n" +msgstr "サーバのバージョン: %1$s; ホスト名: %2$s\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain #: ../avahi-utils/avahi-browse.c:549 #, c-format msgid "E Ifce Prot Domain\n" -msgstr "事 イン プロト ドメイン\n" +msgstr "E Ifce Prot ドメイン\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain #: ../avahi-utils/avahi-browse.c:553 #, c-format msgid "E Ifce Prot %-*s %-20s Domain\n" -msgstr "事 イン プロト %-*s %-20s ドメイン\n" +msgstr "E Ifce Prot %-*s %-20s ドメイン\n" #. We have been disconnected, so let reconnect #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "切断されました。再接続中...\n" +msgstr "切断されました。再接続しています…\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 #: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 #, c-format msgid "Failed to create client object: %s\n" -msgstr "クライアントオプションの生成に失敗: %s\n" +msgstr "クライアントオブジェクトの作成に失敗しました: %s\n" #: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 #: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "クライアント失敗、終了中: %s\n" +msgstr "クライアントが失敗しました。終了しています: %s\n" #: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" -msgstr "デーモンを待っています ...\n" +msgstr "デーモンを待っています...\n" #: ../avahi-utils/avahi-browse.c:647 msgid "" @@ -664,19 +663,18 @@ msgid "" " -f --no-fail Don't fail if the daemon is not available\n" " -p --parsable Output in parsable format\n" msgstr "" -" -h --help このヘルプを表示\n" -" -V --version バージョンを表示\n" -" -D --browse-domains サービスの代わりにブラウズしているドメインをブラウ" -"ズ\n" -" -a --all タイプに関係なく、全てのサービスを表示\n" -" -d --domain=DOMAIN ブラウズするドメイン\n" -" -v --verbose 饒舌モードを有効にする\n" -" -t --terminate 完全な一覧を事実上ダンプした後に終了\n" -" -c --cache 全エントリーをキャッシュからダンプした後に終了\n" -" -l --ignore-local ローカルなサービスを無視\n" -" -r --resolve 見つかった解決サービス\n" -" -f --no-fail デーモンが利用可能でなくても失敗しない\n" -" -p --parsable 構文解析可能な形式で出力\n" +" -h --help このヘルプを表示する\n" +" -V --version バージョンを表示する\n" +" -D --browse-domains サービスではなくドメインを検索\n" +" -a --all タイプではなく、全てのサービスを表示する\n" +" -d --domain=DOMAIN 検索するドメインを指定\n" +" -v --verbose 冗長出力モードを有効にする\n" +" -t --terminate ほぼ完全なリストを出力した後で終了する\n" +" -c --cache キャッシュから全てのエントリを出力して終了する\n" +" -l --ignore-local ローカルサービスを無視する\n" +" -r --resolve 見つけたサービスを解決する\n" +" -f --no-fail デーモンが利用できない際、fail しない\n" +" -p --parsable パース処理が可能な形式で出力する\n" #: ../avahi-utils/avahi-browse.c:660 msgid "" @@ -684,53 +682,53 @@ msgid "" " -b --dump-db Dump service type database\n" msgstr "" " -k --no-db-lookup サービスタイプを検索しない\n" -" -b --dump-db サービスタイプデータベースをダンプする\n" +" -b --dump-db サービスタイプのデータベースを出力する\n" #: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 #, c-format msgid "Too few arguments\n" -msgstr "パラメーターが少なすぎます\n" +msgstr "引数が少なすぎます\n" #: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 #: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" -msgstr "単純な投票オブジェクトの生成に失敗。\n" +msgstr "simple poll オブジェクトの作成に失敗しました\n" #: ../avahi-utils/avahi-publish.c:76 #, c-format msgid "Established under name '%s'\n" -msgstr "'%s' という名前の配下に設立\n" +msgstr "名前 '%s' で接続を確立します\n" #: ../avahi-utils/avahi-publish.c:81 #, c-format msgid "Failed to register: %s\n" -msgstr "登録に失敗: %s\n" +msgstr "登録に失敗しました: %s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "名前が衝突しました、新しい名前 '%s' を採用しました。\n" +msgstr "名前が衝突しました。新しい名前 '%s' を利用します。\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format msgid "Failed to create entry group: %s\n" -msgstr "エントリーグループの生成に失敗しました: %s\n" +msgstr "エントリグループの作成に失敗しました: %s\n" #: ../avahi-utils/avahi-publish.c:124 #, c-format msgid "Failed to add address: %s\n" -msgstr "アドレスの追加に失敗: %s\n" +msgstr "アドレスの追加に失敗しました: %s\n" #: ../avahi-utils/avahi-publish.c:134 #, c-format msgid "Failed to add service: %s\n" -msgstr "サービスの追加に失敗: %s\n" +msgstr "サービスの追加に失敗しました: %s\n" #: ../avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "サブタイプ '%s' の追加に失敗: %s\n" +msgstr "サブタイプ '%1$s' の追加に失敗しました: %2$s\n" #: ../avahi-utils/avahi-publish.c:191 #, c-format @@ -738,7 +736,7 @@ msgid "Host name conflict\n" msgstr "ホスト名の衝突\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -758,25 +756,26 @@ msgstr "" "%s [オプション] %s <名前> <タイプ> <ポート> [<txt ...>]\n" "%s [オプション] %s <ホスト名> <アドレス>\n" "\n" -" -h --help このヘルプを表示\n" -" -V --version バージョンを表示\n" +" -h --help このヘルプを表示する\n" +" -V --version バージョンを表示する\n" " -s --service サービスを公開する\n" " -a --address アドレスを公開する\n" -" -v --verbose 饒舌モードを有効にする\n" -" -d --domain=DOMAIN サービスを公開するドメイン\n" -" -H --host=DOMAIN サービスが存在するホスト\n" -" --subtype=SUBTYPE このサービスと一緒に登録する追加のサブタイプ\n" -" -f --no-fail デーモンが利用可能ではなくても失敗しない\n" +" -v --verbose 冗長出力モードを有効にする\n" +" -d --domain=DOMAIN サービスを公開するドメインを指定\n" +" -H --host=DOMAIN サービスが存在するホストを指定\n" +" --subtype=SUBTYPE このサービスを登録する追加サブタイプを指定\n" +" -R --no-reverse アドレスの逆引きエントリを公開しない\n" +" -f --no-fail デーモンが利用できない際に fail しない\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format msgid "Bad number of arguments\n" -msgstr "パラメーターの数がおかしい\n" +msgstr "引数の数が間違っています\n" #: ../avahi-utils/avahi-publish.c:329 #, c-format msgid "Failed to parse port number: %s\n" -msgstr "ポート番号の解析に失敗: %s\n" +msgstr "ポート番号をパースするのに失敗しました: %s\n" #: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 #, c-format @@ -786,12 +785,12 @@ msgstr "コマンドが指定されていません。\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "ホスト名 '%s' の解決に失敗: %s\n" +msgstr "ホスト名 '%1$s' の解決に失敗しました: %2$s\n" #: ../avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "アドレス '%s' の解決に失敗: %s\n" +msgstr "アドレス '%1$s' の解決に失敗しました: %2$s\n" #: ../avahi-utils/avahi-resolve.c:157 #, c-format @@ -814,24 +813,24 @@ msgstr "" " -V --version バージョンを表示\n" " -n --name ホスト名を解決\n" " -a --address アドレスを解決\n" -" -v --verbose 饒舌モードを有効にする\n" -" -6 IPv6 アドレスを検索\n" -" -4 IPv4 アドレスを検索\n" +" -v --verbose 冗長出力モードを有効にする\n" +" -6 IPv6 アドレスで検索\n" +" -4 IPv4 アドレスで検索\n" #: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" -msgstr "ホスト名のリゾルバーの生成に失敗: %s\n" +msgstr "ホスト名のリゾルバ作成に失敗しました: %s\n" #: ../avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "アドレス '%s' の解析に失敗\n" +msgstr "アドレス '%s' の処理に失敗しました\n" #: ../avahi-utils/avahi-resolve.c:314 #, c-format msgid "Failed to create address resolver: %s\n" -msgstr "アドレスリゾルバーの生成に失敗: %s\n" +msgstr "アドレスのリゾルバ作成に失敗しました: %s\n" #: ../avahi-utils/avahi-set-host-name.c:73 #, c-format @@ -842,18 +841,18 @@ msgid "" " -V --version Show version\n" " -v --verbose Enable verbose mode\n" msgstr "" -"%s [オプション] <新ホスト名>\n" +"%s [オプション] <新しいホスト名>\n" "\n" " -h --help このヘルプを表示\n" " -V --version バージョンを表示\n" -" -v --verbose 饒舌モードを有効にする\n" +" -v --verbose 冗長出力モードを有効にする\n" #: ../avahi-utils/avahi-set-host-name.c:114 #, c-format msgid "Invalid number of arguments, expecting exactly one.\n" -msgstr "パラメーターの数が不当です、一つだけ期待しています。\n" +msgstr "引数の数が不正です、一つだけを指定してください。\n" #: ../avahi-utils/avahi-set-host-name.c:193 #, c-format msgid "Host name successfully changed to %s\n" -msgstr "ホスト名の %s への変更に成功しました\n" +msgstr "ホスト名は %s に変更されました\n" @@ -1,21 +1,24 @@ # Russian translation for avahi # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 # This file is distributed under the same license as the avahi package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. # +# FIRST AUTHOR <EMAIL@ADDRESS>, 2008. +# Yuri Kozlov <yuray@komyakino.ru>, 2010. msgid "" msgstr "" "Project-Id-Version: avahi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2008-03-26 03:20+0000\n" -"Last-Translator: Артём Попов <artfwo@gmail.com>\n" -"Language-Team: Russian <ru@li.org>\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-08-15 13:16+0400\n" +"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" +"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2008-04-01 04:32+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Generator: Lokalize 1.0\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" #: ../avahi-common/error.c:30 msgid "OK" @@ -43,7 +46,7 @@ msgstr "Не найден подходящий сетевой протокол" #: ../avahi-common/error.c:36 msgid "Invalid DNS TTL" -msgstr "Неверное время кэширования DNS" +msgstr "Неверный TTL DNS" #: ../avahi-common/error.c:37 msgid "Resource record key is pattern" @@ -51,7 +54,7 @@ msgstr "Ключ записи ресурса является шаблоном" #: ../avahi-common/error.c:38 msgid "Local name collision" -msgstr "Коллизия локальных имён" +msgstr "Перекрытие локальных имён" #: ../avahi-common/error.c:39 msgid "Invalid record" @@ -111,7 +114,7 @@ msgstr "Неожиданная ошибка D-Bus" #: ../avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "Не удалось соединиться с демоном" +msgstr "Не удалось соединиться со службой" #: ../avahi-common/error.c:56 msgid "Memory exhausted" @@ -123,7 +126,7 @@ msgstr "Переданный объект недействителен" #: ../avahi-common/error.c:58 msgid "Daemon not running" -msgstr "Демон не запущен" +msgstr "Служба не запущена" #: ../avahi-common/error.c:59 msgid "Invalid interface index" @@ -211,7 +214,7 @@ msgstr "Неверный тип DNS" #: ../avahi-common/error.c:82 msgid "Invalid DNS class" -msgstr "Не верный класс DNS" +msgstr "Неверный класс DNS" #: ../avahi-common/error.c:83 msgid "Not supported" @@ -240,82 +243,75 @@ msgstr "Неверный код ошибки" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 #: ../avahi-python/avahi-discover/avahi-discover.py:76 msgid "<i>No service currently selected.</i>" -msgstr "" +msgstr "<i>Служба не выбрана.</i>" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 msgid "Avahi Discovery" -msgstr "" +msgstr "Avahi Discovery" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 msgid "Avahi Zeroconf Browser" -msgstr "" +msgstr "Обозреватель Avahi Zeroconf" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 -#, fuzzy msgid "Browse for Zeroconf services available on your network" -msgstr "Поиск служб в <b>локальной сети</b>:" +msgstr "Поиск служб Zeroconf в локальной сети" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 msgid "TXT Data:" -msgstr "" +msgstr "Данные TXT:" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "Пустая группа" +msgstr "пусто" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Имя службы" +msgstr "Тип службы:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Имя службы" +msgstr "Имя службы:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "_Домен..." +msgstr "Название домена:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Интерфейс:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 msgid "Address:" -msgstr "" +msgstr "Адрес:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" -msgstr "" +msgstr "Типы искомых служб" #: ../avahi-ui/avahi-ui.c:185 msgid "A NULL terminated list of service types to browse for" -msgstr "" +msgstr "Список типов искомых служб, завершающийся NULL" #: ../avahi-ui/avahi-ui.c:190 -#, fuzzy msgid "Domain" -msgstr "_Домен..." +msgstr "Домен" #: ../avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" -msgstr "" +msgstr "Домен поиска или домен по умолчанию, если NULL" #: ../avahi-ui/avahi-ui.c:196 -#, fuzzy msgid "Service Type" -msgstr "Имя службы" +msgstr "Тип службы" #: ../avahi-ui/avahi-ui.c:196 msgid "The service type of the selected service" -msgstr "" +msgstr "Тип выбранной службы" #: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 msgid "Service Name" @@ -323,67 +319,64 @@ msgstr "Имя службы" #: ../avahi-ui/avahi-ui.c:202 msgid "The service name of the selected service" -msgstr "" +msgstr "Имя выбранной службы" #: ../avahi-ui/avahi-ui.c:208 msgid "Address" -msgstr "" +msgstr "Адрес" #: ../avahi-ui/avahi-ui.c:208 msgid "The address of the resolved service" -msgstr "" +msgstr "Адрес определённого устройства" #: ../avahi-ui/avahi-ui.c:213 msgid "Port" -msgstr "" +msgstr "Порт" #: ../avahi-ui/avahi-ui.c:213 msgid "The IP port number of the resolved service" -msgstr "" +msgstr "Номер порта протокола IP определённого устройства" #: ../avahi-ui/avahi-ui.c:219 -#, fuzzy msgid "Host Name" -msgstr "Имя" +msgstr "Имя узла" #: ../avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" -msgstr "" +msgstr "Имя узла определённого устройства" #: ../avahi-ui/avahi-ui.c:225 msgid "TXT Data" -msgstr "" +msgstr "Данные TXT" #: ../avahi-ui/avahi-ui.c:225 msgid "The TXT data of the resolved service" -msgstr "" +msgstr "Данные TXT определённого устройства" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" -msgstr "Неверное имя службы" +msgstr "Определение службы" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "Автоматически определить выбранную службу перед возвратом" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" -msgstr "Неверное имя службы" +msgstr "Определить имя узла службы" #: ../avahi-ui/avahi-ui.c:236 msgid "" "Resolve the host name of the selected service automatically before returning" -msgstr "" +msgstr "Автоматически определить имя узла выбранной службы перед возвратом" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" -msgstr "" +msgstr "Адресное семейство" #: ../avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" -msgstr "" +msgstr "Определение адресного семейства для имени узла" #: ../avahi-ui/avahi-ui.c:324 #, c-format @@ -418,7 +411,7 @@ msgstr "Не удалось открыть домен Avahi: %s" #: ../avahi-ui/avahi-ui.c:704 msgid "Browse service type list is empty!" -msgstr "" +msgstr "Список типов искомых служб пуст!" #: ../avahi-ui/avahi-ui.c:715 #, c-format @@ -454,7 +447,6 @@ msgid "Change domain" msgstr "Изменить домен" #: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 -#, fuzzy msgid "Browsing..." msgstr "Поиск..." @@ -464,7 +456,7 @@ msgstr "Инициализация..." #: ../avahi-ui/avahi-ui.c:1140 msgid "Location" -msgstr "" +msgstr "Расположение" #: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 msgid "Name" @@ -489,6 +481,13 @@ msgid "" " -S --shell Browse both SSH and VNC\n" " -d --domain=DOMAIN The domain to browse in\n" msgstr "" +"%s [параметры]\n" +"\n" +" -h --help Показать эту справку\n" +" -s --ssh Вывести список доступных серверов SSH\n" +" -v --vnc Вывести список доступных серверов VNC\n" +" -S --shell Вывести список доступных серверов SSH и VNC\n" +" -d --domain=ДОМЕН Домен поиска серверов\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -532,19 +531,19 @@ msgstr "Отменено.\n" #: ../avahi-ui/bssh.desktop.in.in.h:1 msgid "Avahi SSH Server Browser" -msgstr "" +msgstr "Навигатор Avahi по серверам SSH" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "" +msgstr "Просмотр списка серверов SSH с включённой службой Zeroconf" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" -msgstr "" +msgstr "Навигатор Avahi по серверам VNC" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "" +msgstr "Просмотр списка серверов VNC с включённой службой Zeroconf" #: ../avahi-utils/avahi-browse.c:107 #, c-format @@ -732,7 +731,7 @@ msgid "Host name conflict\n" msgstr "Конфликт имени узла\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -752,15 +751,17 @@ msgstr "" "%s [параметры] %s <имя> <тип> <порт> [<текст...>]\n" "%s [параметры] %s <имя узла> <адрес>\n" "\n" -" -h --help Вывести данную справку\n" +" -h --help Вывести эту справку\n" " -V --version Вывести версию\n" " -s --service Опубликовать службу\n" " -a --address Опубликовать адрес\n" " -v --verbose Включить подробный режим\n" -" -d --domain=DOMAIN Домен для публикации службы\n" -" -H --host=DOMAIN Узел, на котором размещается служба\n" -" --subtype=SUBTYPE Дополнительный подтип для регистрации этой службы\n" -" -f --no-fail Не завершать работу, если демон недоступен\n" +" -d --domain=ДОМЕН Домен для публикации службы\n" +" -H --host=ДОМЕН Узел, на котором размещается служба\n" +" --subtype=ПОДТИП Дополнительный подтип для регистрации этой службы\n" +" -R --no-reverse Не опубликовывать элемент обратного адреса\n" +" -f --no-fail Не завершать работу, если процесс службы " +"недоступен\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format @@ -775,7 +776,7 @@ msgstr "Ошибка разбора номера порта: %s\n" #: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" -msgstr "Не указана команда\n" +msgstr "Не указана команда.\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format @@ -851,3 +852,4 @@ msgstr "Неверное число аргументов, ожидается р #, c-format msgid "Host name successfully changed to %s\n" msgstr "Имя узла успешно изменено на %s\n" + diff --git a/po/sl.po b/po/sl.po new file mode 100644 index 0000000..e2de47b --- /dev/null +++ b/po/sl.po @@ -0,0 +1,838 @@ +# Slovenian translation for avahi +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the avahi package. +# +# Matej Urbančič <matej.urban@gmail.com>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: avahi master\n" +"Report-Msgid-Bugs-To: http://avahi.org/report\n" +"POT-Creation-Date: 2010-09-16 15:24+0000\n" +"PO-Revision-Date: 2010-09-22 08:10+0100\n" +"Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n" +"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Launchpad-Export-Date: 2010-09-21 09:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#: ../avahi-common/error.c:30 +msgid "OK" +msgstr "V redu" + +#: ../avahi-common/error.c:31 +msgid "Operation failed" +msgstr "Dejanje je spodletelo" + +#: ../avahi-common/error.c:32 +msgid "Bad state" +msgstr "Slabo stanje" + +#: ../avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "Neveljavno ime gostitelja" + +#: ../avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "Neveljavno ime domene" + +#: ../avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "Na voljo ni nobenega ustreznega omrežnega protokola" + +#: ../avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "Neveljaven DNS TTL" + +#: ../avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "Ključ zapisa vira je vzorec" + +#: ../avahi-common/error.c:38 +msgid "Local name collision" +msgstr "Krajevno poimenovanje je v sporu" + +#: ../avahi-common/error.c:39 +msgid "Invalid record" +msgstr "Neveljaven zapis" + +#: ../avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "Neveljavno ime storitve" + +#: ../avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "Neveljavna vrsta storitve" + +#: ../avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "Neveljavna številka vrat" + +#: ../avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "Neveljaven ključ zapisa" + +#: ../avahi-common/error.c:45 +msgid "Invalid address" +msgstr "Neveljaven naslov" + +#: ../avahi-common/error.c:46 +msgid "Timeout reached" +msgstr "Čas je potekel" + +#: ../avahi-common/error.c:47 +msgid "Too many clients" +msgstr "Preveč odjemalcev" + +#: ../avahi-common/error.c:48 +msgid "Too many objects" +msgstr "Preveč predmetov" + +#: ../avahi-common/error.c:49 +msgid "Too many entries" +msgstr "Preveč vnosov" + +#: ../avahi-common/error.c:50 +msgid "OS Error" +msgstr "Napaka operacijskega okolja" + +#: ../avahi-common/error.c:52 +msgid "Access denied" +msgstr "Dostop je zavrnjen" + +#: ../avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "Neveljavno dejanje" + +#: ../avahi-common/error.c:54 +msgid "An unexpected D-Bus error occured" +msgstr "Prišlo je do nepričakovane napake vodila D-Bus." + +#: ../avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "Povezava z ozadnjim programom je spodletela" + +#: ../avahi-common/error.c:56 +msgid "Memory exhausted" +msgstr "Pomnilnik je izčrpan" + +#: ../avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "Poslan predmet ni veljaven" + +#: ../avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "Ozadnji program ni zagnan" + +#: ../avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "Neveljavno kazalo vmesnika" + +#: ../avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "Neveljavna specifikacija protokola" + +#: ../avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "Neveljavne zastavice" + +#: ../avahi-common/error.c:63 +msgid "Not found" +msgstr "Ni zadetkov" + +#: ../avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "Neveljavna nastavitev" + +#: ../avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "Neskladje različic" + +#: ../avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "Neveljavna podvrsta storitve" + +#: ../avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "Neveljaven paket" + +#: ../avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "Neveljavna DNS vrnitvena koda" + +#: ../avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "Spodletel odziv DNS: FORMERR" + +#: ../avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "Spodletel odziv DNS: SERVFAIL" + +#: ../avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "Spodletel odziv DNS: NXDOMAIN" + +#: ../avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "Spodletel odziv DNS: NOTIMP" + +#: ../avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "Spodletel odziv DNS: REFUSED" + +#: ../avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "Spodletel odziv DNS: YXDOMAIN" + +#: ../avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "Spodletel odziv DNS: YXRRSET" + +#: ../avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "Spodletel odziv DNS: NXRRSET" + +#: ../avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "Spodletel odziv DNS: NOTAUTH" + +#: ../avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "Spodletel odziv DNS: NOTZONE" + +#: ../avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "Neveljaven podatek RDATA" + +#: ../avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "Neveljavna vrsta DNS" + +#: ../avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "Neveljaven razred DNS" + +#: ../avahi-common/error.c:83 +msgid "Not supported" +msgstr "Ni podprto" + +#: ../avahi-common/error.c:85 +msgid "Not permitted" +msgstr "Ni dovoljeno" + +#: ../avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "Neveljaven argument" + +#: ../avahi-common/error.c:87 +msgid "Is empty" +msgstr "Je prazno" + +#: ../avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "Zahtevana operacija je zaradi odvečnosti neveljavna" + +#: ../avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "Neveljavna koda napake" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: ../avahi-python/avahi-discover/avahi-discover.py:76 +msgid "<i>No service currently selected.</i>" +msgstr "<i>Trenutno ni izbrane storitve.</i>" + +#: ../avahi-discover-standalone/avahi-discover.ui.h:2 +msgid "Avahi Discovery" +msgstr "Odkrivanje storitev Avahi" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +msgid "Avahi Zeroconf Browser" +msgstr "Brskalnik Avahi Zeroconf" + +#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +msgid "Browse for Zeroconf services available on your network" +msgstr "Brskanje med razpoložljivimi storitvami Zeroconf v omrežju" + +#: ../avahi-python/avahi-discover/avahi-discover.py:224 +msgid "TXT" +msgstr "TXT" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "TXT Data:" +msgstr "Podatki TXT:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:226 +msgid "empty" +msgstr "prazno" + +#: ../avahi-python/avahi-discover/avahi-discover.py:228 +msgid "Service Type:" +msgstr "Vrsta storitve:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:229 +msgid "Service Name:" +msgstr "Ime storitve:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:230 +msgid "Domain Name:" +msgstr "Ime domene:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:231 +msgid "Interface:" +msgstr "Vmesnik:" + +#: ../avahi-python/avahi-discover/avahi-discover.py:232 +msgid "Address:" +msgstr "Naslov:" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "Brskanje med vrstami storitev" + +#: ../avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "Nično zaključen seznam vrst storitev za brskanje" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "Domena" + +#: ../avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "Domena za brskanje oziroma NULL za privzeto domeno" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "Vrsta storitve" + +#: ../avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "Vrsta izbrane storitve" + +#: ../avahi-ui/avahi-ui.c:202 +#: ../avahi-ui/avahi-ui.c:1019 +msgid "Service Name" +msgstr "Ime storitve" + +#: ../avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "Ime izbrane storitve" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "Naslov" + +#: ../avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "Naslov razrešene storitve" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "Vrata" + +#: ../avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "Številka vrat IP za razrešeno storitev" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "Ime gostitelja" + +#: ../avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "Ime gostitelja razrešene storitve" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "Podatki TXT" + +#: ../avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "Podatki TXT razrešene storitve" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "Razrešene storitve" + +#: ../avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "Samodejno razreši izbrano storitev pred povrnitvijo" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "Ime gostitelja storitve razreševanja" + +#: ../avahi-ui/avahi-ui.c:236 +msgid "Resolve the host name of the selected service automatically before returning" +msgstr "Samodejno razreši ime gostitelja izbrane storitve pred povratkom" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "Družina naslova" + +#: ../avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "Družina naslova za razreševanje imena gostitelja" + +#: ../avahi-ui/avahi-ui.c:324 +#, c-format +msgid "Avahi client failure: %s" +msgstr "Dejanje odjemalca Avahi je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:386 +#, c-format +msgid "Avahi resolver failure: %s" +msgstr "Razreševanje podatkov Avahi je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:516 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "Brskanje za storitev vrste %s v domeni %s je spodletela: %s" + +#: ../avahi-ui/avahi-ui.c:517 +#: ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 +#: ../avahi-utils/avahi-browse.c:178 +#: ../avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "ni na voljo" + +#: ../avahi-ui/avahi-ui.c:647 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "Dejanje domenskega brskalnika Avahi je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:682 +#, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "Branje domene Avahi je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:704 +msgid "Browse service type list is empty!" +msgstr "Seznam brskanja vrst storitev je prazen!" + +#: ../avahi-ui/avahi-ui.c:715 +#, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "Povezovanje s strežnikom Avahi je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:733 +msgid "Browsing for services on <b>local network</b>:" +msgstr "Brskanje za storitvami na <b>krajevnem omrežju</b>:" + +#: ../avahi-ui/avahi-ui.c:735 +#, c-format +msgid "Browsing for services in domain <b>%s</b>:" +msgstr "Brskanje za storitvami v domeni <b>%s</b>:" + +#: ../avahi-ui/avahi-ui.c:771 +#, c-format +msgid "Failed to create browser for %s: %s" +msgstr "Ustvarjanje brskalnika za %s je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:901 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "Ustvarjanje razreševalnika za %s vrste %s v domeni %s je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:976 +#, c-format +msgid "Failed to create domain browser: %s" +msgstr "Ustvarjanje brskalnika domen je spodletelo: %s" + +#: ../avahi-ui/avahi-ui.c:987 +msgid "Change domain" +msgstr "Spremeni domeno" + +#: ../avahi-ui/avahi-ui.c:1027 +#: ../avahi-ui/avahi-ui.c:1158 +msgid "Browsing..." +msgstr "Brskanje ..." + +#: ../avahi-ui/avahi-ui.c:1116 +msgid "Initializing..." +msgstr "Začenjanje ..." + +#: ../avahi-ui/avahi-ui.c:1140 +msgid "Location" +msgstr "Mesto" + +#: ../avahi-ui/avahi-ui.c:1145 +#: ../avahi-utils/avahi-browse.c:553 +msgid "Name" +msgstr "Ime" + +#: ../avahi-ui/avahi-ui.c:1150 +#: ../avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "Vrsta" + +#: ../avahi-ui/avahi-ui.c:1162 +msgid "_Domain..." +msgstr "_Domena ..." + +#: ../avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" +"%s [možnosti]\n" +"\n" +" -h --help Pokaže to pomoč\n" +" -s --ssh Brskanje za SSH strežniki\n" +" -v --vnc Brskanje za VNC strežniki\n" +" -S --shell Brskanje za SSH in VNC strežniki\n" +" -d --domain=DOMENA Domena za brskanje\n" + +#: ../avahi-ui/bssh.c:101 +#: ../avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "Preveč argumentov\n" + +#: ../avahi-ui/bssh.c:149 +msgid "Choose Shell Server" +msgstr "Izbor lupinskega strežnika" + +#: ../avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "Namizje" + +#: ../avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "Terminal" + +#: ../avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "Izbor strežnika VNC" + +#: ../avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "Izbor strežnika SSH" + +#: ../avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "Povezovanje z '%s' ...\n" + +#: ../avahi-ui/bssh.c:240 +#, c-format +msgid "execlp() failed: %s\n" +msgstr "ukaz execlp() je spodletel: %s\n" + +#: ../avahi-ui/bssh.c:250 +#, c-format +msgid "Canceled.\n" +msgstr "Preklicano.\n" + +#: ../avahi-ui/bssh.desktop.in.in.h:1 +msgid "Avahi SSH Server Browser" +msgstr "Avahi brskalnik strežnika SSH" + +#: ../avahi-ui/bssh.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "Brskanje med omogočenimi strežniki Zeroconf SSH" + +#: ../avahi-ui/bvnc.desktop.in.in.h:1 +msgid "Avahi VNC Server Browser" +msgstr "Avahi brskalnik strežnika VNC" + +#: ../avahi-ui/bvnc.desktop.in.in.h:2 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "Brskanje med omogočenimi strežniki Zeroconf VNC" + +#: ../avahi-utils/avahi-browse.c:107 +#, c-format +msgid ": All for now\n" +msgstr ": Vse za zdaj\n" + +#: ../avahi-utils/avahi-browse.c:118 +#, c-format +msgid ": Cache exhausted\n" +msgstr ": Predpomnilnik je izčrpan\n" + +#: ../avahi-utils/avahi-browse.c:239 +#: ../avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "Razreševanje storitve '%s' vrste '%s' v domeni '%s' je spodletelo: %s\n" + +#: ../avahi-utils/avahi-browse.c:340 +#, c-format +msgid "service_browser failed: %s\n" +msgstr "brskalnik storitev je spodletel: %s\n" + +#: ../avahi-utils/avahi-browse.c:378 +#, c-format +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "ukaz avahi_service_browser_new() spodletel: %s\n" + +#: ../avahi-utils/avahi-browse.c:414 +#, c-format +msgid "service_type_browser failed: %s\n" +msgstr "ukaz service_type_browser spodletel: %s\n" + +#: ../avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "ukaz avahi_service_type_browser_new() je spodletel: %s\n" + +#: ../avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "ukaz avahi_domain_browser_new() je spodletel: %s\n" + +#: ../avahi-utils/avahi-browse.c:535 +#: ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 +#: ../avahi-utils/avahi-set-host-name.c:168 +#, c-format +msgid "Failed to query version string: %s\n" +msgstr "Poizvedovanje niza različice je spodletelo: %s\n" + +#: ../avahi-utils/avahi-browse.c:540 +#: ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 +#: ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-set-host-name.c:189 +#, c-format +msgid "Failed to query host name: %s\n" +msgstr "Poizvedovanje imena gostitelja je spodletelo: %s\n" + +#: ../avahi-utils/avahi-browse.c:544 +#: ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 +#: ../avahi-utils/avahi-set-host-name.c:177 +#, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "Različica strežnika: %s; ime gostitelja: %s\n" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:549 +#, c-format +msgid "E Ifce Prot Domain\n" +msgstr "Domena Ifce Prot\n" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: ../avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "E Ifce Prot %-*s %-20s domena\n" + +#. We have been disconnected, so let reconnect +#: ../avahi-utils/avahi-browse.c:585 +#: ../avahi-utils/avahi-publish.c:163 +#, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "Povezava je prekinjena; poteka ponovno povezovanje ...\n" + +#: ../avahi-utils/avahi-browse.c:599 +#: ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 +#: ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 +#: ../avahi-utils/avahi-set-host-name.c:160 +#, c-format +msgid "Failed to create client object: %s\n" +msgstr "Ustvarjanje predmeta odjemalca je spodletelo: %s\n" + +#: ../avahi-utils/avahi-browse.c:604 +#: ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 +#: ../avahi-utils/avahi-set-host-name.c:59 +#, c-format +msgid "Client failure, exiting: %s\n" +msgstr "Spodletelo izvajanje odjemalca, zato bo dejanje končano: %s\n" + +#: ../avahi-utils/avahi-browse.c:623 +#: ../avahi-utils/avahi-publish.c:206 +#, c-format +msgid "Waiting for daemon ...\n" +msgstr "Čakanje na ozadnji program ...\n" + +#: ../avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" + +#: ../avahi-utils/avahi-browse.c:766 +#: ../avahi-utils/avahi-resolve.c:219 +#, c-format +msgid "Too few arguments\n" +msgstr "Premalo argumentov\n" + +#: ../avahi-utils/avahi-browse.c:821 +#: ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 +#: ../avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "Ustvarjanje predmeta enostavne ankete je spodletelo.\n" + +#: ../avahi-utils/avahi-publish.c:76 +#, c-format +msgid "Established under name '%s'\n" +msgstr "Vzpostavljeno pod imenom '%s'\n" + +#: ../avahi-utils/avahi-publish.c:81 +#, c-format +msgid "Failed to register: %s\n" +msgstr "Vpisovanje je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:94 +#, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "Poimenovanje je v sporu, zato bo izbrano novo ime '%s'.\n" + +#: ../avahi-utils/avahi-publish.c:114 +#, c-format +msgid "Failed to create entry group: %s\n" +msgstr "Ustvarjanje skupine vnosa je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:124 +#, c-format +msgid "Failed to add address: %s\n" +msgstr "Dodajanje naslova je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:134 +#, c-format +msgid "Failed to add service: %s\n" +msgstr "Dodajanje storitve je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:140 +#, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "Dodajanje podvrste '%s' je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:191 +#, c-format +msgid "Host name conflict\n" +msgstr "Ime gostitelja je v sporu\n" + +#: ../avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s <name> <type> <port> [<txt ...>]\n" +"%s [options] %s <host-name> <address>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" + +#: ../avahi-utils/avahi-publish.c:303 +#: ../avahi-utils/avahi-publish.c:318 +#, c-format +msgid "Bad number of arguments\n" +msgstr "Napačno število argumentov.\n" + +#: ../avahi-utils/avahi-publish.c:329 +#, c-format +msgid "Failed to parse port number: %s\n" +msgstr "Razreševanje številke vrat je spodletelo: %s\n" + +#: ../avahi-utils/avahi-publish.c:361 +#: ../avahi-utils/avahi-resolve.c:246 +#, c-format +msgid "No command specified.\n" +msgstr "Ni določenega ukaza.\n" + +#: ../avahi-utils/avahi-resolve.c:89 +#, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "Razreševanje imena gostitelja '%s' je spodletelo: %s\n" + +#: ../avahi-utils/avahi-resolve.c:126 +#, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "Razreševanje naslova '%s' je spodletelo: %s\n" + +#: ../avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s <host name ...>\n" +"%s [options] %s <address ... >\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" + +#: ../avahi-utils/avahi-resolve.c:299 +#: ../avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "Ustvarjanje razreševalnika gostiteljskih imen je spodletelo: %s\n" + +#: ../avahi-utils/avahi-resolve.c:309 +#, c-format +msgid "Failed to parse address '%s'\n" +msgstr "Razčlenjevanje naslova '%s' je spodletelo\n" + +#: ../avahi-utils/avahi-resolve.c:314 +#, c-format +msgid "Failed to create address resolver: %s\n" +msgstr "Ustvarjanje naslovnega razreševalnika je spodletelo: %s\n" + +#: ../avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] <new host name>\n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" + +#: ../avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "Neveljavno število argumentov, saj je pričakovan le en.\n" + +#: ../avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "Ime gostitelja je uspešno spremenjeno v %s\n" + @@ -1,14 +1,14 @@ # Swedish translation for avahi. -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the avahi package. -# Daniel Nylander <po@danielnylander.se>, 2008, 2009. +# Daniel Nylander <po@danielnylander.se>, 2008, 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: avahi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2009-07-28 00:28+0100\n" +"POT-Creation-Date: 2010-07-28 18:48+0000\n" +"PO-Revision-Date: 2010-08-12 01:12+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "MIME-Version: 1.0\n" @@ -254,41 +254,35 @@ msgstr "Bläddra efter Zeroconf-tjänster tillgängliga på ditt nätverk" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "TXT Data:" -msgstr "TXT Data" +msgstr "TXT Data:" #: ../avahi-python/avahi-discover/avahi-discover.py:226 -#, fuzzy msgid "empty" -msgstr "Är tom" +msgstr "tom" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "Tjänstetyp" +msgstr "Tjänstetyp:" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "Tjänstenamn" +msgstr "Tjänstenamn:" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "Domän" +msgstr "Domännamn:" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "Gränssnitt:" #: ../avahi-python/avahi-discover/avahi-discover.py:232 -#, fuzzy msgid "Address:" -msgstr "Adress" +msgstr "Adress:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -314,7 +308,8 @@ msgstr "Tjänstetyp" msgid "The service type of the selected service" msgstr "Tjänstetypen för den markerade tjänsten" -#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +#: ../avahi-ui/avahi-ui.c:202 +#: ../avahi-ui/avahi-ui.c:1019 msgid "Service Name" msgstr "Tjänstenamn" @@ -355,23 +350,20 @@ msgid "The TXT data of the resolved service" msgstr "TXT-data för den uppslagna tjänsten" #: ../avahi-ui/avahi-ui.c:230 -#, fuzzy msgid "Resolve Service" msgstr "Slå upp tjänst" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "Slå upp den valda tjänsten automatiskt före återgång" #: ../avahi-ui/avahi-ui.c:236 -#, fuzzy msgid "Resolve Service Host Name" msgstr "Slå upp tjänstens värdnamn" #: ../avahi-ui/avahi-ui.c:236 -msgid "" -"Resolve the host name of the selected service automatically before returning" -msgstr "" +msgid "Resolve the host name of the selected service automatically before returning" +msgstr "Slå upp värdnamnet för den valda tjänsten automatiskt före återgång" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" @@ -396,8 +388,10 @@ msgstr "Fel i Avahi-uppslag: %s" msgid "Browsing for service type %s in domain %s failed: %s" msgstr "Bläddring efter tjänstetypen %s i domänen %s misslyckades: %s" -#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 -#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-ui/avahi-ui.c:517 +#: ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 +#: ../avahi-utils/avahi-browse.c:178 #: ../avahi-utils/avahi-browse.c:179 msgid "n/a" msgstr "Inte tillgänglig" @@ -438,8 +432,7 @@ msgstr "Misslyckades med att skapa bläddrare för %s: %s" #: ../avahi-ui/avahi-ui.c:901 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "" -"Misslyckades med att skapa uppslagare för %s av typen %s i domänen %s: %s" +msgstr "Misslyckades med att skapa uppslagare för %s av typen %s i domänen %s: %s" #: ../avahi-ui/avahi-ui.c:976 #, c-format @@ -450,7 +443,8 @@ msgstr "Misslyckades med att skapa domänbläddrare: %s" msgid "Change domain" msgstr "Byt domän" -#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +#: ../avahi-ui/avahi-ui.c:1027 +#: ../avahi-ui/avahi-ui.c:1158 msgid "Browsing..." msgstr "Bläddrar..." @@ -462,11 +456,13 @@ msgstr "Initierar..." msgid "Location" msgstr "Plats" -#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1145 +#: ../avahi-utils/avahi-browse.c:553 msgid "Name" msgstr "Namn" -#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1150 +#: ../avahi-utils/avahi-browse.c:553 msgid "Type" msgstr "Typ" @@ -493,7 +489,8 @@ msgstr "" " -S --shell Bläddra bland både SSH och VNC\n" " -d --domain=DOMÄN Domänen att bläddra i\n" -#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#: ../avahi-ui/bssh.c:101 +#: ../avahi-utils/avahi-browse.c:775 #, c-format msgid "Too many arguments\n" msgstr "För många argument\n" @@ -559,12 +556,11 @@ msgstr ": Alla just nu\n" msgid ": Cache exhausted\n" msgstr ": Cachen är full\n" -#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#: ../avahi-utils/avahi-browse.c:239 +#: ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "" -"Misslyckades med att slå upp tjänsten \"%s\" av typen \"%s\" i domänen \"%s" -"\": %s\n" +msgstr "Misslyckades med att slå upp tjänsten \"%s\" av typen \"%s\" i domänen \"%s\": %s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format @@ -591,21 +587,27 @@ msgstr "avahi_service_type_browser_new() misslyckades: %s\n" msgid "avahi_domain_browser_new() failed: %s\n" msgstr "avahi_domain_browser_new() misslyckades: %s\n" -#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 -#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#: ../avahi-utils/avahi-browse.c:535 +#: ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 +#: ../avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" msgstr "Misslyckades med att fråga efter versionssträng: %s\n" -#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 -#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-browse.c:540 +#: ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 +#: ../avahi-utils/avahi-set-host-name.c:173 #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" msgstr "Misslyckades med att fråga efter värdnamn: %s\n" -#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 -#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#: ../avahi-utils/avahi-browse.c:544 +#: ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 +#: ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" msgstr "Serverversion: %s; Värdnamn: %s\n" @@ -625,25 +627,32 @@ msgid "E Ifce Prot %-*s %-20s Domain\n" msgstr "H Grän Prot %-*s %-20s Domän\n" #. We have been disconnected, so let reconnect -#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#: ../avahi-utils/avahi-browse.c:585 +#: ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" msgstr "Frånkopplad, återansluter ...\n" -#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 -#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 -#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#: ../avahi-utils/avahi-browse.c:599 +#: ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 +#: ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 +#: ../avahi-utils/avahi-set-host-name.c:160 #, c-format msgid "Failed to create client object: %s\n" msgstr "Misslyckades med att skapa klientobjekt: %s\n" -#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 -#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#: ../avahi-utils/avahi-browse.c:604 +#: ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 +#: ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" msgstr "Klientfel, avslutar: %s\n" -#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#: ../avahi-utils/avahi-browse.c:623 +#: ../avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" msgstr "Väntar på demon ...\n" @@ -656,8 +665,7 @@ msgid "" " -a --all Show all services, regardless of the type\n" " -d --domain=DOMAIN The domain to browse in\n" " -v --verbose Enable verbose mode\n" -" -t --terminate Terminate after dumping a more or less complete " -"list\n" +" -t --terminate Terminate after dumping a more or less complete list\n" " -c --cache Terminate after dumping all entries from the cache\n" " -l --ignore-local Ignore local services\n" " -r --resolve Resolve services found\n" @@ -666,13 +674,11 @@ msgid "" msgstr "" " -h --help Visa denna hjälp\n" " -V --version Visa version\n" -" -D --browse-domains Bläddra efter bläddringsdomäner istället för " -"tjänster\n" +" -D --browse-domains Bläddra efter bläddringsdomäner istället för tjänster\n" " -a --all Visa alla tjänster, oavsett typen\n" " -d --domain=DOMÄN Domänen att bläddra i\n" " -v --verbose Aktivera informativt läge\n" -" -t --terminate Avsluta efter dumpning av en mer eller mindre " -"komplett lista\n" +" -t --terminate Avsluta efter dumpning av en mer eller mindre komplett lista\n" " -c --cache Avsluta efter dumpning av alla poster från cachen\n" " -l --ignore-local Ignorera lokala tjänster\n" " -r --resolve Slå upp tjänster som hittats\n" @@ -687,13 +693,16 @@ msgstr "" " -k --no-db-lookup Slå inte upp tjänstetyper\n" " -b --dump-db Dumpa databasen över tjänstetyper\n" -#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#: ../avahi-utils/avahi-browse.c:766 +#: ../avahi-utils/avahi-resolve.c:219 #, c-format msgid "Too few arguments\n" msgstr "För få argument\n" -#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 -#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#: ../avahi-utils/avahi-browse.c:821 +#: ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 +#: ../avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" msgstr "Misslyckades med att skapa enkelt poll-objekt.\n" @@ -739,7 +748,7 @@ msgid "Host name conflict\n" msgstr "Värdnamnskonflikt\n" #: ../avahi-utils/avahi-publish.c:216 -#, fuzzy, c-format +#, c-format msgid "" "%s [options] %s <name> <type> <port> [<txt ...>]\n" "%s [options] %s <host-name> <address>\n" @@ -751,8 +760,7 @@ msgid "" " -v --verbose Enable verbose mode\n" " -d --domain=DOMAIN Domain to publish service in\n" " -H --host=DOMAIN Host where service resides\n" -" --subtype=SUBTYPE An additional subtype to register this service " -"with\n" +" --subtype=SUBTYPE An additional subtype to register this service with\n" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" @@ -766,11 +774,12 @@ msgstr "" " -v --verbose Aktivera informativt läge\n" " -d --domain=DOMÄN Domän att publicera tjänst i\n" " -H --host=DOMÄN Värd där tjänsten finns\n" -" --subtype=UNDERTYP En ytterligare undertyp att registrera denna " -"tjänst med\n" +" --subtype=UNDERTYP En ytterligare undertyp att registrera denna tjänst med\n" +" -R --no-reverse Publicera inte baklängespost med address\n" " -f --no-fail Misslycka inte om demonen inte är tillgänglig\n" -#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#: ../avahi-utils/avahi-publish.c:303 +#: ../avahi-utils/avahi-publish.c:318 #, c-format msgid "Bad number of arguments\n" msgstr "Dåligt antal argument\n" @@ -780,7 +789,8 @@ msgstr "Dåligt antal argument\n" msgid "Failed to parse port number: %s\n" msgstr "Misslyckades med att tolka portnummer: %s\n" -#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#: ../avahi-utils/avahi-publish.c:361 +#: ../avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" msgstr "Inget kommando specificerat.\n" @@ -820,7 +830,8 @@ msgstr "" " -6 Slå upp IPv6-adress\n" " -4 Slå upp IPv4-adress\n" -#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#: ../avahi-utils/avahi-resolve.c:299 +#: ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" msgstr "Misslyckades med att skapa uppslagare för värdnamn: %s\n" @@ -859,3 +870,4 @@ msgstr "Ogiltigt antal argument, exakt ett argument förväntas.\n" #, c-format msgid "Host name successfully changed to %s\n" msgstr "Värdnamnet ändrades till %s\n" + diff --git a/po/zh_TW.po b/po/zh_TW.po index bb14226..8188223 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 03:02+0200\n" -"PO-Revision-Date: 2010-05-03 11:20+0800\n" +"POT-Creation-Date: 2010-06-29 08:42+0000\n" +"PO-Revision-Date: 2010-08-18 01:01+0800\n" "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" "Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "操作失敗" #: ../avahi-common/error.c:32 msgid "Bad state" -msgstr "" +msgstr "狀態不良" #: ../avahi-common/error.c:33 msgid "Invalid host name" @@ -49,11 +49,11 @@ msgstr "" #: ../avahi-common/error.c:38 msgid "Local name collision" -msgstr "" +msgstr "本機名稱衝突" #: ../avahi-common/error.c:39 msgid "Invalid record" -msgstr "" +msgstr "無效的紀錄" #: ../avahi-common/error.c:41 msgid "Invalid service name" @@ -69,7 +69,7 @@ msgstr "無效的連接埠編號" #: ../avahi-common/error.c:44 msgid "Invalid record key" -msgstr "" +msgstr "無效的紀錄金鑰" #: ../avahi-common/error.c:45 msgid "Invalid address" @@ -77,7 +77,7 @@ msgstr "無效的位址" #: ../avahi-common/error.c:46 msgid "Timeout reached" -msgstr "" +msgstr "已達逾時限制" #: ../avahi-common/error.c:47 msgid "Too many clients" @@ -85,14 +85,14 @@ msgstr "太多用戶端" #: ../avahi-common/error.c:48 msgid "Too many objects" -msgstr "" +msgstr "過多物件" #: ../avahi-common/error.c:49 +#, fuzzy msgid "Too many entries" msgstr "" #: ../avahi-common/error.c:50 -#, fuzzy msgid "OS Error" msgstr "OS 錯誤" @@ -106,11 +106,11 @@ msgstr "無效的操作" #: ../avahi-common/error.c:54 msgid "An unexpected D-Bus error occured" -msgstr "" +msgstr "遭遇到未預期的 D-Bus 錯誤" #: ../avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "" +msgstr "幕後程式連線失敗" #: ../avahi-common/error.c:56 msgid "Memory exhausted" @@ -118,7 +118,7 @@ msgstr "記憶體已耗盡" #: ../avahi-common/error.c:57 msgid "The object passed in was not valid" -msgstr "" +msgstr "傳入的物件無效" #: ../avahi-common/error.c:58 msgid "Daemon not running" @@ -133,7 +133,6 @@ msgid "Invalid protocol specification" msgstr "無效的協定規格" #: ../avahi-common/error.c:61 -#, fuzzy msgid "Invalid flags" msgstr "無效的旗標" @@ -155,59 +154,59 @@ msgstr "無效的服務子類型" #: ../avahi-common/error.c:67 msgid "Invalid packet" -msgstr "" +msgstr "無效的封包" #: ../avahi-common/error.c:68 msgid "Invalid DNS return code" -msgstr "" +msgstr "無效的 DNS 回傳碼" #: ../avahi-common/error.c:69 msgid "DNS failure: FORMERR" -msgstr "" +msgstr "DNS 失敗：FORMERR" #: ../avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" -msgstr "" +msgstr "DNS 失敗：SERVFAIL" #: ../avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" -msgstr "" +msgstr "DNS 失敗：NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" -msgstr "" +msgstr "DNS 失敗：NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" -msgstr "" +msgstr "DNS 失敗：REFUSED" #: ../avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" -msgstr "" +msgstr "DNS 失敗：YXDOMAIN" #: ../avahi-common/error.c:76 msgid "DNS failure: YXRRSET" -msgstr "" +msgstr "DNS 失敗：YXRRSET" #: ../avahi-common/error.c:77 msgid "DNS failure: NXRRSET" -msgstr "" +msgstr "DNS 失敗：NXRRSET" #: ../avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" -msgstr "" +msgstr "DNS 失敗：NOTAUTH" #: ../avahi-common/error.c:79 msgid "DNS failure: NOTZONE" -msgstr "" +msgstr "DNS 失敗：NOTZONE" #: ../avahi-common/error.c:80 msgid "Invalid RDATA" -msgstr "" +msgstr "無效的 RDATA" #: ../avahi-common/error.c:81 msgid "Invalid DNS type" -msgstr "" +msgstr "無效的 DNS 類型" #: ../avahi-common/error.c:82 msgid "Invalid DNS class" @@ -215,11 +214,11 @@ msgstr "" #: ../avahi-common/error.c:83 msgid "Not supported" -msgstr "" +msgstr "未支援" #: ../avahi-common/error.c:85 msgid "Not permitted" -msgstr "" +msgstr "未許可" #: ../avahi-common/error.c:86 msgid "Invalid argument" @@ -227,11 +226,11 @@ msgstr "無效的引數" #: ../avahi-common/error.c:87 msgid "Is empty" -msgstr "" +msgstr "是空的" #: ../avahi-common/error.c:88 msgid "The requested operation is invalid because redundant" -msgstr "" +msgstr "請求的操作無效，因為重複" #: ../avahi-common/error.c:94 msgid "Invalid Error Code" @@ -240,7 +239,7 @@ msgstr "無效的錯誤代碼" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 #: ../avahi-python/avahi-discover/avahi-discover.py:76 msgid "<i>No service currently selected.</i>" -msgstr "" +msgstr "<i>目前未選取服務。</i>" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 msgid "Avahi Discovery" @@ -256,38 +255,35 @@ msgstr "在您的網路上瀏覽可用的 Zeroconf 服務" #: ../avahi-python/avahi-discover/avahi-discover.py:224 msgid "TXT" -msgstr "" +msgstr "TXT" #: ../avahi-python/avahi-discover/avahi-discover.py:226 msgid "TXT Data:" -msgstr "" +msgstr "TXT 資料：" #: ../avahi-python/avahi-discover/avahi-discover.py:226 msgid "empty" -msgstr "" +msgstr "空的" #: ../avahi-python/avahi-discover/avahi-discover.py:228 -#, fuzzy msgid "Service Type:" -msgstr "瀏覽服務類型" +msgstr "服務類型：" #: ../avahi-python/avahi-discover/avahi-discover.py:229 -#, fuzzy msgid "Service Name:" -msgstr "無效的服務名稱" +msgstr "服務名稱：" #: ../avahi-python/avahi-discover/avahi-discover.py:230 -#, fuzzy msgid "Domain Name:" -msgstr "網域" +msgstr "網域名稱：" #: ../avahi-python/avahi-discover/avahi-discover.py:231 msgid "Interface:" -msgstr "" +msgstr "介面：" #: ../avahi-python/avahi-discover/avahi-discover.py:232 msgid "Address:" -msgstr "" +msgstr "位址：" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" @@ -307,23 +303,24 @@ msgstr "" #: ../avahi-ui/avahi-ui.c:196 msgid "Service Type" -msgstr "" +msgstr "服務類型" #: ../avahi-ui/avahi-ui.c:196 msgid "The service type of the selected service" -msgstr "" +msgstr "所選服務的服務類型" -#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019 +#: ../avahi-ui/avahi-ui.c:202 +#: ../avahi-ui/avahi-ui.c:1019 msgid "Service Name" -msgstr "" +msgstr "服務名稱" #: ../avahi-ui/avahi-ui.c:202 msgid "The service name of the selected service" -msgstr "" +msgstr "所選服務的服務名稱" #: ../avahi-ui/avahi-ui.c:208 msgid "Address" -msgstr "" +msgstr "位址" #: ../avahi-ui/avahi-ui.c:208 msgid "The address of the resolved service" @@ -331,15 +328,15 @@ msgstr "" #: ../avahi-ui/avahi-ui.c:213 msgid "Port" -msgstr "" +msgstr "連接埠" #: ../avahi-ui/avahi-ui.c:213 msgid "The IP port number of the resolved service" -msgstr "" +msgstr "解析服務的 IP 連接埠號碼" #: ../avahi-ui/avahi-ui.c:219 msgid "Host Name" -msgstr "" +msgstr "主機名稱" #: ../avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" @@ -347,7 +344,7 @@ msgstr "" #: ../avahi-ui/avahi-ui.c:225 msgid "TXT Data" -msgstr "" +msgstr "TXT 資料" #: ../avahi-ui/avahi-ui.c:225 msgid "The TXT data of the resolved service" @@ -355,20 +352,19 @@ msgstr "" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve Service" -msgstr "" +msgstr "解析服務" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "" +msgstr "在回傳之前自動解析所選的服務" #: ../avahi-ui/avahi-ui.c:236 msgid "Resolve Service Host Name" -msgstr "" +msgstr "解析服務主機名稱" #: ../avahi-ui/avahi-ui.c:236 -msgid "" -"Resolve the host name of the selected service automatically before returning" -msgstr "" +msgid "Resolve the host name of the selected service automatically before returning" +msgstr "在回傳之前自動解析所選服務的主機名稱" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" @@ -381,20 +377,22 @@ msgstr "" #: ../avahi-ui/avahi-ui.c:324 #, c-format msgid "Avahi client failure: %s" -msgstr "" +msgstr "Avahi 用戶端失敗：%s" #: ../avahi-ui/avahi-ui.c:386 #, c-format msgid "Avahi resolver failure: %s" -msgstr "" +msgstr "Avahi 解析失敗：%s" #: ../avahi-ui/avahi-ui.c:516 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" msgstr "" -#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168 -#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 +#: ../avahi-ui/avahi-ui.c:517 +#: ../avahi-utils/avahi-browse.c:168 +#: ../avahi-utils/avahi-browse.c:169 +#: ../avahi-utils/avahi-browse.c:178 #: ../avahi-utils/avahi-browse.c:179 msgid "n/a" msgstr "無法使用" @@ -446,7 +444,8 @@ msgstr "" msgid "Change domain" msgstr "變更網域" -#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158 +#: ../avahi-ui/avahi-ui.c:1027 +#: ../avahi-ui/avahi-ui.c:1158 msgid "Browsing..." msgstr "正在瀏覽..." @@ -458,11 +457,13 @@ msgstr "正在初始化..." msgid "Location" msgstr "位置" -#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1145 +#: ../avahi-utils/avahi-browse.c:553 msgid "Name" msgstr "名稱" -#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553 +#: ../avahi-ui/avahi-ui.c:1150 +#: ../avahi-utils/avahi-browse.c:553 msgid "Type" msgstr "類型" @@ -482,7 +483,8 @@ msgid "" " -d --domain=DOMAIN The domain to browse in\n" msgstr "" -#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#: ../avahi-ui/bssh.c:101 +#: ../avahi-utils/avahi-browse.c:775 #, c-format msgid "Too many arguments\n" msgstr "太多引數\n" @@ -548,7 +550,8 @@ msgstr ": 現在是全部\n" msgid ": Cache exhausted\n" msgstr ": 快取已耗盡\n" -#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#: ../avahi-utils/avahi-browse.c:239 +#: ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" msgstr "" @@ -578,21 +581,27 @@ msgstr "" msgid "avahi_domain_browser_new() failed: %s\n" msgstr "" -#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 -#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#: ../avahi-utils/avahi-browse.c:535 +#: ../avahi-utils/avahi-publish.c:394 +#: ../avahi-utils/avahi-resolve.c:280 +#: ../avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" msgstr "" -#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 -#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 +#: ../avahi-utils/avahi-browse.c:540 +#: ../avahi-utils/avahi-publish.c:399 +#: ../avahi-utils/avahi-resolve.c:285 +#: ../avahi-utils/avahi-set-host-name.c:173 #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" msgstr "" -#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 -#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#: ../avahi-utils/avahi-browse.c:544 +#: ../avahi-utils/avahi-publish.c:403 +#: ../avahi-utils/avahi-resolve.c:289 +#: ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" msgstr "" @@ -612,25 +621,32 @@ msgid "E Ifce Prot %-*s %-20s Domain\n" msgstr "" #. We have been disconnected, so let reconnect -#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#: ../avahi-utils/avahi-browse.c:585 +#: ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "" +msgstr "已斷線，正在重新連接...\n" -#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 -#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 -#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#: ../avahi-utils/avahi-browse.c:599 +#: ../avahi-utils/avahi-browse.c:829 +#: ../avahi-utils/avahi-publish.c:170 +#: ../avahi-utils/avahi-publish.c:386 +#: ../avahi-utils/avahi-resolve.c:272 +#: ../avahi-utils/avahi-set-host-name.c:160 #, c-format msgid "Failed to create client object: %s\n" msgstr "" -#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 -#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#: ../avahi-utils/avahi-browse.c:604 +#: ../avahi-utils/avahi-publish.c:175 +#: ../avahi-utils/avahi-resolve.c:143 +#: ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "" +msgstr "用戶端失敗，正在退出：%s\n" -#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#: ../avahi-utils/avahi-browse.c:623 +#: ../avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" msgstr "" @@ -643,8 +659,7 @@ msgid "" " -a --all Show all services, regardless of the type\n" " -d --domain=DOMAIN The domain to browse in\n" " -v --verbose Enable verbose mode\n" -" -t --terminate Terminate after dumping a more or less complete " -"list\n" +" -t --terminate Terminate after dumping a more or less complete list\n" " -c --cache Terminate after dumping all entries from the cache\n" " -l --ignore-local Ignore local services\n" " -r --resolve Resolve services found\n" @@ -658,13 +673,16 @@ msgid "" " -b --dump-db Dump service type database\n" msgstr "" -#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#: ../avahi-utils/avahi-browse.c:766 +#: ../avahi-utils/avahi-resolve.c:219 #, c-format msgid "Too few arguments\n" -msgstr "" +msgstr "過少引數\n" -#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 -#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#: ../avahi-utils/avahi-browse.c:821 +#: ../avahi-utils/avahi-publish.c:378 +#: ../avahi-utils/avahi-resolve.c:264 +#: ../avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" msgstr "" @@ -677,12 +695,12 @@ msgstr "" #: ../avahi-utils/avahi-publish.c:81 #, c-format msgid "Failed to register: %s\n" -msgstr "" +msgstr "註冊失敗：%s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "" +msgstr "名稱衝突，揀選新名稱 '%s'。\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format @@ -707,7 +725,7 @@ msgstr "" #: ../avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" -msgstr "" +msgstr "主機名稱衝突\n" #: ../avahi-utils/avahi-publish.c:216 #, c-format @@ -722,13 +740,13 @@ msgid "" " -v --verbose Enable verbose mode\n" " -d --domain=DOMAIN Domain to publish service in\n" " -H --host=DOMAIN Host where service resides\n" -" --subtype=SUBTYPE An additional subtype to register this service " -"with\n" +" --subtype=SUBTYPE An additional subtype to register this service with\n" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" -#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#: ../avahi-utils/avahi-publish.c:303 +#: ../avahi-utils/avahi-publish.c:318 #, c-format msgid "Bad number of arguments\n" msgstr "" @@ -738,7 +756,8 @@ msgstr "" msgid "Failed to parse port number: %s\n" msgstr "" -#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#: ../avahi-utils/avahi-publish.c:361 +#: ../avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" msgstr "" @@ -768,7 +787,8 @@ msgid "" " -4 Lookup IPv4 address\n" msgstr "" -#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#: ../avahi-utils/avahi-resolve.c:299 +#: ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" msgstr "" @@ -801,4 +821,5 @@ msgstr "" #: ../avahi-utils/avahi-set-host-name.c:193 #, c-format msgid "Host name successfully changed to %s\n" -msgstr "" +msgstr "主機名稱成功變更為 %s\n" + diff --git a/service-type-database/Makefile.in b/service-type-database/Makefile.in index c93b2bc..d04b47b 100644 --- a/service-type-database/Makefile.in +++ b/service-type-database/Makefile.in @@ -256,6 +256,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -328,7 +330,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/tests/Makefile.in b/tests/Makefile.in index ebd4ef3..96cfad7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -270,6 +270,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -342,7 +344,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ |